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
9c461e10
Commit
9c461e10
authored
9 years ago
by
ant31
Browse files
Options
Downloads
Patches
Plain Diff
Use inline update for resolv.conf
parent
9a032494
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/dnsmasq/tasks/main.yml
+36
-5
36 additions, 5 deletions
roles/dnsmasq/tasks/main.yml
roles/dnsmasq/templates/resolv.conf.j2
+0
-9
0 additions, 9 deletions
roles/dnsmasq/templates/resolv.conf.j2
with
36 additions
and
14 deletions
roles/dnsmasq/tasks/main.yml
+
36
−
5
View file @
9c461e10
...
...
@@ -53,11 +53,37 @@
timeout
:
100
when
:
inventory_hostname in groups['kube-master']
-
name
:
update resolv.conf with new DNS setup
template
:
src
:
resolv.conf.j2
dest
:
/etc/resolv.conf
mode
:
644
-
name
:
check resolvconf
stat
:
path=/etc/resolvconf/resolv.conf.d/head
register
:
resolvconf
-
name
:
target resolv.conf file
set_fact
:
resolvconffile
:
>
{%- if resolvconf.stat.exists == True -%}
/etc/resolvconf/resolv.conf.d/head
{%- else -%}
/etc/resolv.conf
{%- endif -%}
-
name
:
Add search resolv.conf
lineinfile
:
line
:
search {{ [ 'default.svc.' + dns_domain, 'svc.' + dns_domain, dns_domain ] | join(' ') }}
dest
:
"
{{resolvconffile}}"
state
:
present
insertafter
:
EOF
backup
:
yes
follow
:
yes
-
name
:
Add all masters as nameserver
lineinfile
:
line
:
nameserver {{ hostvars[item]['ansible_default_ipv4']['address'] }}
dest
:
"
{{resolvconffile}}"
state
:
present
insertafter
:
EOF
backup
:
yes
follow
:
yes
with_items
:
groups['kube-master']
-
name
:
disable resolv.conf modification by dhclient
copy
:
src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate mode=u+x backup=yes
...
...
@@ -67,4 +93,9 @@
copy
:
src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/nodnsupdate mode=u+x backup=yes
when
:
ansible_os_family == "RedHat"
-
name
:
update resolvconf
command
:
resolvconf -u
changed_when
:
False
when
:
resolvconf.stat.exists == True
-
meta
:
flush_handlers
This diff is collapsed.
Click to expand it.
roles/dnsmasq/templates/resolv.conf.j2
deleted
100644 → 0
+
0
−
9
View file @
9a032494
; generated by ansible
search {{ [ 'default.svc.' + dns_domain, 'svc.' + dns_domain, dns_domain ] | join(' ') }}
{% if inventory_hostname in groups['kube-master'] %}
nameserver {{ ansible_default_ipv4.address }}
{% else %}
{% for host in groups['kube-master'] %}
nameserver {{ hostvars[host]['ansible_default_ipv4']['address'] }}
{% endfor %}
{% endif %}
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