Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Add a test for nmcli and also a blacklist var we can set on hosts that shouldn't have ifcfg managed by ansible.

Browse source
This commit is contained in:
Kevin Fenzi 2016-02-05 20:17:28 +00:00
parent 18f920701a
commit d5a366b5f6
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
roles/base/tasks/main.yml
View file

@ -20,11 +20,16 @@
- base
- ifcfg
- name: check for NetworkManager/nmcli
command: /usr/bin/test -f /usr/bin/nmcli
register: nmclitest
ignore_errors: true
- name: disable resolv.conf control from NM
ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
notify:
- restart NetworkManager
when: ansible_distribution_major_version|int >=7
when: ansible_distribution_major_version|int >=7 and nmclitest|success and ansible_ifcfg_blacklist not defined
tags:
- config
- resolvconf
@ -37,7 +42,7 @@
changed_when: false
failed_when: 'if_uuid.stdout == ""'
always_run: yes
when: ansible_distribution_major_version|int >=7
when: ansible_distribution_major_version|int >=7 and nmclitest|success and ansible_ifcfg_blacklist not defined
tags:
- config
- ifcfg
@ -51,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']
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
tags:
- config
- ifcfg