diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm index 07db5c8e46..086d3eabad 100644 --- a/inventory/group_vars/buildarm +++ b/inventory/group_vars/buildarm @@ -1,6 +1,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/releng-sudoers" +ansible_ifcfg_blacklist: true koji_server_url: "http://koji.fedoraproject.org/kojihub" koji_weburl: "http:/koji.fedoraproject.org/koji" diff --git a/inventory/group_vars/download-rdu2 b/inventory/group_vars/download-rdu2 index 6e42c2bcda..81bf91b376 100644 --- a/inventory/group_vars/download-rdu2 +++ b/inventory/group_vars/download-rdu2 @@ -5,6 +5,7 @@ rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" nrpe_procs_warn: 900 nrpe_procs_crit: 1000 virt_install_command: "{{ virt_install_command_rhel6 }}" +ansible_ifcfg_blacklist: true # nfs mount options, overrides the all/default nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3" diff --git a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org index 0ddade218a..c8051ebb4a 100644 --- a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org +++ b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org @@ -5,3 +5,7 @@ # compose channel that need a rw mount nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" + +gw: 10.5.125.254 +eth0_ip: 10.5.125.94 +eth1_ip: 10.5.127.154 diff --git a/inventory/host_vars/buildhw-02.phx2.fedoraproject.org b/inventory/host_vars/buildhw-02.phx2.fedoraproject.org new file mode 100644 index 0000000000..be1a6fbbd7 --- /dev/null +++ b/inventory/host_vars/buildhw-02.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.93 +eth1_ip: 10.5.127.153 diff --git a/inventory/host_vars/buildhw-03.phx2.fedoraproject.org b/inventory/host_vars/buildhw-03.phx2.fedoraproject.org new file mode 100644 index 0000000000..436e864558 --- /dev/null +++ b/inventory/host_vars/buildhw-03.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.97 +eth1_ip: 10.5.127.157 diff --git a/inventory/host_vars/buildhw-04.phx2.fedoraproject.org b/inventory/host_vars/buildhw-04.phx2.fedoraproject.org new file mode 100644 index 0000000000..5c24a6efe6 --- /dev/null +++ b/inventory/host_vars/buildhw-04.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.95 +eth1_ip: 10.5.127.155 diff --git a/inventory/host_vars/buildhw-05.phx2.fedoraproject.org b/inventory/host_vars/buildhw-05.phx2.fedoraproject.org new file mode 100644 index 0000000000..56dd733adf --- /dev/null +++ b/inventory/host_vars/buildhw-05.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.96 +eth1_ip: 10.5.127.156 diff --git a/inventory/host_vars/buildhw-06.phx2.fedoraproject.org b/inventory/host_vars/buildhw-06.phx2.fedoraproject.org new file mode 100644 index 0000000000..e66c6afbd7 --- /dev/null +++ b/inventory/host_vars/buildhw-06.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.114 +eth1_ip: 10.5.127.133 diff --git a/inventory/host_vars/buildhw-07.phx2.fedoraproject.org b/inventory/host_vars/buildhw-07.phx2.fedoraproject.org new file mode 100644 index 0000000000..c50264fed4 --- /dev/null +++ b/inventory/host_vars/buildhw-07.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.115 +eth1_ip: 10.5.127.134 diff --git a/inventory/host_vars/buildhw-08.phx2.fedoraproject.org b/inventory/host_vars/buildhw-08.phx2.fedoraproject.org new file mode 100644 index 0000000000..d4a09761c0 --- /dev/null +++ b/inventory/host_vars/buildhw-08.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.129 +eth1_ip: 10.5.127.127 diff --git a/inventory/host_vars/buildhw-09.phx2.fedoraproject.org b/inventory/host_vars/buildhw-09.phx2.fedoraproject.org new file mode 100644 index 0000000000..f81e8fdf19 --- /dev/null +++ b/inventory/host_vars/buildhw-09.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.130 +eth1_ip: 10.5.127.128 diff --git a/inventory/host_vars/buildhw-10.phx2.fedoraproject.org b/inventory/host_vars/buildhw-10.phx2.fedoraproject.org new file mode 100644 index 0000000000..1e1365ec5c --- /dev/null +++ b/inventory/host_vars/buildhw-10.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.131 +eth1_ip: 10.5.127.129 diff --git a/inventory/host_vars/buildhw-11.phx2.fedoraproject.org b/inventory/host_vars/buildhw-11.phx2.fedoraproject.org new file mode 100644 index 0000000000..7eeb6647c7 --- /dev/null +++ b/inventory/host_vars/buildhw-11.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.125 +eth1_ip: 10.5.127.212 diff --git a/inventory/host_vars/buildhw-12.phx2.fedoraproject.org b/inventory/host_vars/buildhw-12.phx2.fedoraproject.org new file mode 100644 index 0000000000..3b09117e4d --- /dev/null +++ b/inventory/host_vars/buildhw-12.phx2.fedoraproject.org @@ -0,0 +1,4 @@ +--- +gw: 10.5.125.254 +eth0_ip: 10.5.125.126 +eth1_ip: 10.5.127.213 diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 882204e5ed..aca3c2f2be 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -64,7 +64,7 @@ # - restart NetworkManager - reload NetworkManager-connections - apply interface-changes - when: (virthost is not defined) and (not item.startswith('tun')) and (not item.startswith('virbr')) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest|success and ( not ansible_ifcfg_blacklist ) + when: (virthost is not defined) and (not item.startswith('tun')) and (not item.startswith('virbr')) and (not item.startswith('vnet')) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest|success and ( not ansible_ifcfg_blacklist ) tags: - config - ifcfg