From bfa6013d80422ba48fb15b594a94db69c8bee6ce Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@gmail.com>
Date: Fri, 26 Jun 2020 14:11:12 -0400
Subject: [PATCH] Attempt to fix ansible so that it will set up gw correctly
 using syntax as is used in other parts

---
 .../host_vars/buildhw-a64-01.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-01.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-02.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-03.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-04.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-05.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-06.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-07.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-08.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-09.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-10.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-11.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-12.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-13.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-14.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-15.iad2.fedoraproject.org      | 2 +-
 .../host_vars/buildhw-x64-16.iad2.fedoraproject.org      | 2 +-
 roles/base/templates/ifcfg.j2                            | 9 ++++-----
 18 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
index 84e4483873..38a9586957 100644
--- a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 eth0_ip: 10.3.170.121
-gw: 10.3.170.254
+eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
diff --git a/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
index 3f85f38279..5e0545197f 100644
--- a/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.31
-eth0_gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
index 8234e0e553..dda2b7de2f 100644
--- a/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.32
-eth0_gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-03.iad2.fedoraproject.org
index ad893d3961..9942263e39 100644
--- a/inventory/host_vars/buildhw-x64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-03.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.33
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-04.iad2.fedoraproject.org
index 9df682dd84..abda63e874 100644
--- a/inventory/host_vars/buildhw-x64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-04.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.34
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-05.iad2.fedoraproject.org
index f0f0911ad8..924cc85122 100644
--- a/inventory/host_vars/buildhw-x64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-05.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.35
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-06.iad2.fedoraproject.org
index aff144dd72..bb2dc4cf7f 100644
--- a/inventory/host_vars/buildhw-x64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-06.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.36
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-07.iad2.fedoraproject.org
index 9e9aa7ef7a..bd85848471 100644
--- a/inventory/host_vars/buildhw-x64-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-07.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.37
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-08.iad2.fedoraproject.org
index 9fcdae12df..da4d691025 100644
--- a/inventory/host_vars/buildhw-x64-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-08.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.38
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-09.iad2.fedoraproject.org
index 94d734740a..0c0baf6897 100644
--- a/inventory/host_vars/buildhw-x64-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-09.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.39
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-10.iad2.fedoraproject.org
index 341cdf390d..400921f2c5 100644
--- a/inventory/host_vars/buildhw-x64-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-10.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.40
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-11.iad2.fedoraproject.org
index cb8356d9de..4bcfe5591e 100644
--- a/inventory/host_vars/buildhw-x64-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-11.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.41
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-12.iad2.fedoraproject.org
index 7443c4b09a..842f6806c0 100644
--- a/inventory/host_vars/buildhw-x64-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-12.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.42
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-13.iad2.fedoraproject.org
index 0497870905..4770acfdb7 100644
--- a/inventory/host_vars/buildhw-x64-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-13.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.43
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-14.iad2.fedoraproject.org
index c92d1a352a..5f0244a356 100644
--- a/inventory/host_vars/buildhw-x64-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-14.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.44
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-15.iad2.fedoraproject.org
index 1749c7ae97..a28dee11d9 100644
--- a/inventory/host_vars/buildhw-x64-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-15.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.45
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-16.iad2.fedoraproject.org
index 89e9e170f6..d982908108 100644
--- a/inventory/host_vars/buildhw-x64-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-16.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.46
-gw: 10.3.169.254
+eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/roles/base/templates/ifcfg.j2 b/roles/base/templates/ifcfg.j2
index ad58a378cc..0452ba0e8b 100644
--- a/roles/base/templates/ifcfg.j2
+++ b/roles/base/templates/ifcfg.j2
@@ -7,10 +7,10 @@ NETTYPE="qeth"
 OPTIONS="layer2=1 portno=0"
 {% endif %}
 {% if item in ansible_ifcfg_infra_net_devices %}
-GATEWAY="{{gw}}"
-{% if hostvars[inventory_hostname].datacenter == 'phx2' %}
-DOMAIN="phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
-{% elif hostvars[inventory_hostname].datacenter == 'iad2' %}
+DEFROUTE=yes
+GATEWAY="{{ hostvars[inventory_hostname][item + '_ipv4_gw'] }}"
+{% endif %}
+{% if hostvars[inventory_hostname].datacenter == 'iad2' %}
 DOMAIN="iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
 {% else %}
 DOMAIN="vpn.fedoraproject.org fedoraproject.org"
@@ -18,7 +18,6 @@ DOMAIN="vpn.fedoraproject.org fedoraproject.org"
 # Should be dc set
 DNS1="{{ dns1 }}"
 DNS2="{{ dns2 }}"
-{% endif %}
 HWADDR="{{ hostvars[inventory_hostname]['ansible_' + item]['macaddress']|upper }}"
 {% if item in ansible_ifcfg_disabled %}
 ONBOOT="no"