infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

ok back off various changes to the templates

Browse source
This commit is contained in:
Stephen Smoogen 2020-06-26 18:15:21 -04:00
parent 305bd6af2f
commit f7a2b66c56
17 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
View file

@ -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

2
inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
View file

@ -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

4
roles/base/templates/ifcfg.j2
View file

@ -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 %}