Skip to content
Snippets Groups Projects
Commit 9d8fc8ca authored by Erwan Miran's avatar Erwan Miran Committed by Kubernetes Prow Robot
Browse files

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

parent d1b1add1
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
roles/container-engine/docker/tasks/set_facts_dns.yml
+ 2
− 2
View file @ 9d8fc8ca
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
docker_dns_search_domains: "{{ docker_dns_search_domains + searchdomains|default([]) }}" docker_dns_search_domains: "{{ docker_dns_search_domains + searchdomains|default([]) }}"
- name: check system nameservers - 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 changed_when: False
register: system_nameservers register: system_nameservers
check_mode: no check_mode: no
- name: check system search domains - 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 changed_when: False
register: system_search_domains register: system_search_domains
check_mode: no check_mode: no
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment