diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 390a9a8312..bf95f8a321 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -41,6 +41,8 @@ eth0_nm: 255.255.255.0 eth1_nm: 255.255.255.0 br0_nm: 255.255.255.0 br1_nm: 255.255.255.0 +# Default to managing the network, we want to not do this on select hosts (like cloud nodes) +ansible_ifcfg_blacklist: false # # The default virt-install works for rhel7 or fedora with 1 nic # diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index a9d918ec23..57b3e0a413 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -29,7 +29,7 @@ ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none notify: - restart NetworkManager - when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( ansible_ifcfg_blacklist not defined ) + when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist ) tags: - config - resolvconf @@ -42,7 +42,7 @@ changed_when: false failed_when: 'if_uuid.stdout == ""' always_run: yes - when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( ansible_ifcfg_blacklist not defined ) + when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist ) tags: - config - ifcfg @@ -56,7 +56,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 ( ansible_ifcfg_blacklist not defined ) + 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 ) tags: - config - ifcfg