From 8583bac57f9b827d785cb384d150b1b24a7b7aa1 Mon Sep 17 00:00:00 2001
From: "alexandr.benzonan" <alexandra.benzonana@etu.hesge.ch>
Date: Tue, 11 Apr 2023 15:15:26 +0200
Subject: [PATCH] using clean vars
---
inventory | 22 ++++------------------
static_iface.j2 | 26 +++++++++++++-------------
vars.yml | 26 ++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 31 deletions(-)
create mode 100644 vars.yml
diff --git a/inventory b/inventory
index 1ee5db8..81d770e 100644
--- a/inventory
+++ b/inventory
@@ -1,20 +1,6 @@
[routers]
-R1 ip="1.0.0.1" ip2="2.0.0.1" gateway="2.0.0.2"
-R2 ip="3.0.0.2" ip2="2.0.0.2" gateway="2.0.0.1"
-# R[1:2]
+R1
+R2
[hosts]
-H1 ip="1.0.0.3" gateway="1.0.0.1"
-H2 ip="3.0.0.3" gateway="3.0.0.2"
-# H[1:2]
-
-[all:vars]
-netmask="255.255.255.0"
-
-[hosts:vars]
-ifname="eth0"
-type="host"
-
-[routers:vars]
-ifname="eth1"
-ifname2="eth0"
-type="router"
+H1
+H2
\ No newline at end of file
diff --git a/static_iface.j2 b/static_iface.j2
index 27b46a7..43b36c8 100644
--- a/static_iface.j2
+++ b/static_iface.j2
@@ -1,21 +1,21 @@
-auto {{ifname}}
-iface {{ifname}} inet static
- address {{ip}}
- netmask {{netmask}}
+auto {{all[group_names[0]].ifname}}
+iface {{all[group_names[0]].ifname}} inet static
+ address {{all[inventory_hostname].ip}}
+ netmask {{all.netmask}}
-{% if type == "host" %}
- post-up ip route add default via {{gateway}}
+{% if group_names[0] == "hosts" %}
+ post-up ip route add default via {{all[inventory_hostname].gateway}}
{% endif %}
-{% if type == "router" %}
-auto {{ifname2}}
-iface {{ifname2}} inet static
- address {{ip2}}
- netmask {{netmask}}
+{% if group_names[0] == "routers" %}
+auto {{all['routers'].ifname2}}
+iface {{all['routers'].ifname2}} inet static
+ address {{all[inventory_hostname].ip2}}
+ netmask {{all.netmask}}
{% if inventory_hostname == "R1" %}
- post-up ip route add 3.0.0.0/24 nexthop via {{gateway}}
+ post-up ip route add 3.0.0.0/24 nexthop via {{all[inventory_hostname].gateway}}
{% else %}
- post-up ip route add 1.0.0.0/24 nexthop via {{gateway}}
+ post-up ip route add 1.0.0.0/24 nexthop via {{all[inventory_hostname].gateway}}
{% endif %}
{% endif %}
diff --git a/vars.yml b/vars.yml
new file mode 100644
index 0000000..74828be
--- /dev/null
+++ b/vars.yml
@@ -0,0 +1,26 @@
+all:
+ netmask: 255.255.255.0
+ hosts:
+ ifname: eth0
+
+ routers:
+ ifname: eth1
+ ifname2: eth0
+
+ H1:
+ ip: 1.0.0.3
+ gateway: 1.0.0.1
+
+ H2:
+ ip: 3.0.0.3
+ gateway: 3.0.0.2
+
+ R1:
+ ip: 1.0.0.1
+ ip2: 2.0.0.1
+ gateway: 2.0.0.2
+
+ R2:
+ ip: 3.0.0.2
+ ip2: 2.0.0.2
+ gateway: 2.0.0.1
\ No newline at end of file
--
GitLab