Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
bcdfb3cf
Commit
bcdfb3cf
authored
Jan 10, 2017
by
Bogdan Dobrelya
Committed by
GitHub
Jan 10, 2017
Browse files
Options
Downloads
Plain Diff
Merge pull request #793 from kubernetes-incubator/fix_dhclientconf_path
Fix wrong path of dhclient on CentOS+Azure
parents
79aeb104
8e4e3998
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
+15
-3
15 additions, 3 deletions
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
with
15 additions
and
3 deletions
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
+
15
−
3
View file @
bcdfb3cf
...
@@ -41,15 +41,27 @@
...
@@ -41,15 +41,27 @@
set_fact
:
resolvconffile=/tmp/resolveconf_cloud_init_conf
set_fact
:
resolvconffile=/tmp/resolveconf_cloud_init_conf
when
:
ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
when
:
ansible_os_family in ["CoreOS", "Container Linux by 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 file
s
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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment