C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wrong path of dhclient on CentOS+Azure

Browse source 
This was alredy fixed in #755 but had to be reverted. This PR should be
more intelligent about deciding which path to use.
This commit is contained in:
Alexander Block 2016-12-21 12:54:25 +01:00
parent 29358c08c6
commit 272d8e754b
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
View file

@ -41,15 +41,27 @@
set_fact: resolvconffile=/tmp/resolveconf_cloud_init_conf set_fact: resolvconffile=/tmp/resolveconf_cloud_init_conf
when: ansible_os_family == "CoreOS" when: ansible_os_family == "CoreOS"
- name: target dhclient conf/hook files for Red Hat family - name: check if /etc/dhclient.conf exists
stat: path=/etc/dhclient.conf
register: dhclient_stat
- name: target dhclient conf file for /etc/dhclient.conf
set_fact: set_fact:
dhclientconffile: /etc/dhclient.conf dhclientconffile: /etc/dhclient.conf
when: dhclient_stat.stat.exists
- name: target dhclient conf file for /etc/dhcp/dhclient.conf
set_fact:
dhclientconffile: /etc/dhcp/dhclient.conf
when: not dhclient_stat.stat.exists
- name: target dhclient hook file for Red Hat family
set_fact:
dhclienthookfile: /etc/dhcp/dhclient.d/zdnsupdate.sh dhclienthookfile: /etc/dhcp/dhclient.d/zdnsupdate.sh
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"
- name: target dhclient conf/hook files for Debian family - name: target dhclient hook file for Debian family
set_fact: set_fact:
dhclientconffile: /etc/dhcp/dhclient.conf
dhclienthookfile: /etc/dhcp/dhclient-exit-hooks.d/zdnsupdate dhclienthookfile: /etc/dhcp/dhclient-exit-hooks.d/zdnsupdate
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"