Browse Source

Fix getting nameserver and search for /etc/resolv.conf with comments (#5197)

pull/5268/head
Erwan Miran 5 years ago
committed by Kubernetes Prow Robot
parent
commit
9d8fc8caad
1 changed files with 2 additions and 2 deletions
  1. 4
      roles/container-engine/docker/tasks/set_facts_dns.yml

4
roles/container-engine/docker/tasks/set_facts_dns.yml

@ -29,13 +29,13 @@
docker_dns_search_domains: "{{ docker_dns_search_domains + searchdomains|default([]) }}"
- name: check system nameservers
shell: grep "^nameserver" /etc/resolv.conf | sed 's/^nameserver\s*//'
shell: grep "^nameserver" /etc/resolv.conf | sed -r 's/^nameserver\s*([^#\s]+)\s*(#.*)?/\1/'
changed_when: False
register: system_nameservers
check_mode: no
- name: check system search domains
shell: grep "^search" /etc/resolv.conf | sed 's/^search\s*//'
shell: grep "^search" /etc/resolv.conf | sed -r 's/^search\s*([^#]+)\s*(#.*)?/\1/'
changed_when: False
register: system_search_domains
check_mode: no

Loading…
Cancel
Save