From f7a2b66c56f2d68a6ac43978ee5c156e8514f447 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 26 Jun 2020 18:15:21 -0400 Subject: [PATCH] ok back off various changes to the templates --- inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org | 2 +- inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org | 2 +- roles/base/templates/ifcfg.j2 | 4 ---- 17 files changed, 16 insertions(+), 20 deletions(-) diff --git a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org index 15fdb3bd17..544fd320be 100644 --- a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.31 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org index 8d73c92e56..77ebe0db17 100644 --- a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.32 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org index 14c0d93f8e..f35015cbed 100644 --- a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.33 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org index c49c71f5e6..5954c3bca6 100644 --- a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.34 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org index be8f92fe5d..c08042198e 100644 --- a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.35 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org index f6c465c1df..90ad7d5d6b 100644 --- a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org @@ -1,5 +1,5 @@ --- eth0_ip: 10.3.169.36 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org index 8e12adf252..705a612470 100644 --- a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org @@ -1,5 +1,5 @@ --- eth0_ip: 10.3.169.37 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org index aaf96ea1a6..7d64be6787 100644 --- a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org @@ -1,5 +1,5 @@ --- eth0_ip: 10.3.169.38 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org index 274c084bc3..dab5232a67 100644 --- a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.39 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org index 7164369170..044cbfdcd0 100644 --- a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.40 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org index e2875925d4..7dd0a6034c 100644 --- a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.41 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org index d009b07684..4e2dac2d94 100644 --- a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.42 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org index 5b8a0287e8..0240266ac4 100644 --- a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.43 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org index ead4eae474..f118f51082 100644 --- a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org @@ -1,5 +1,5 @@ --- eth0_ip: 10.3.169.44 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org index 18b5090e68..1cb8e35133 100644 --- a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org @@ -1,6 +1,6 @@ --- eth0_ip: 10.3.169.45 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org index 392cb87ac0..8eb4b920c3 100644 --- a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org +++ b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org @@ -1,5 +1,5 @@ --- eth0_ip: 10.3.169.46 -eth0_ipv4_gw: 10.3.169.254 +gw: 10.3.169.254 datacenter: iad2 eth1_off: true diff --git a/roles/base/templates/ifcfg.j2 b/roles/base/templates/ifcfg.j2 index 1382fef809..807b0325fc 100644 --- a/roles/base/templates/ifcfg.j2 +++ b/roles/base/templates/ifcfg.j2 @@ -8,12 +8,8 @@ OPTIONS="layer2=1 portno=0" {% endif %} {% if item in ansible_ifcfg_infra_net_devices %} DEFROUTE=yes -{% if hostvars[inventory_hostname][item +'ipv4_gw'] is defined %} -GATEWAY="{{ hostvars[inventory_hostname][item + 'ipv4_gw'] }}" -{% else %} GATEWAY="{{ gw }}" {% endif %} -{% endif %} {% if hostvars[inventory_hostname].datacenter == 'iad2' %} DOMAIN="iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org" {% else %}