Skip to content

Commit

Permalink
Change the way 'debops.dhcpd' gathers nameservers
Browse files Browse the repository at this point in the history
  • Loading branch information
drybjed committed Aug 29, 2015
1 parent 4052e5e commit 271da47
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Expand Up @@ -18,6 +18,9 @@ v0.1.1
- Fix a templating error when IPv6 networking is not present on a host.
[drybjed]

- Change the way role gathers the list of nameservers to avoid issue with
``sed`` command in shell module. [drybjed]

v0.1.0
------

Expand Down
4 changes: 2 additions & 2 deletions tasks/main.yml
Expand Up @@ -28,14 +28,14 @@
when: dhcpd_register_relay_debconf|d() and dhcpd_register_relay_debconf.changed

- name: Get list of nameservers configured in /etc/resolv.conf
shell: grep -E '^nameserver\s' /etc/resolv.conf | awk '{print $2}' | sed -e 'N;s/\n/ /'
shell: grep -E '^nameserver\s' /etc/resolv.conf | awk '{print $2}'
register: dhcpd_register_nameservers
changed_when: False
when: dhcpd_mode == 'server'

- name: Convert list of nameservers to Ansible list
set_fact:
dhcpd_runtime_nameservers: "{{ dhcpd_register_nameservers.stdout.split(' ') }}"
dhcpd_runtime_nameservers: "{{ dhcpd_register_nameservers.stdout_lines }}"
when: (dhcpd_register_nameservers is defined and dhcpd_register_nameservers.stdout)

- name: Configure DHCP server
Expand Down

0 comments on commit 271da47

Please sign in to comment.