Merge pull request #21 from le9i0nx/fix_check_run

fix run --check
debops · Apr 8, 2016 · 64ba0fb · 64ba0fb
2 parents 8053f8c + 79d3afc
commit 64ba0fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -32,6 +32,7 @@
   register: dhcpd_register_nameservers
   changed_when: False
   when: dhcpd_mode == 'server'
+  always_run: yes
 
 - name: Convert list of nameservers to Ansible list
   set_fact:

diff --git a/templates/etc/dhcp/auto_options.j2 b/templates/etc/dhcp/auto_options.j2
@@ -6,10 +6,10 @@ option domain-search "{{ dhcpd_tpl_domain_search | join('", "') }}";
 option dhcp6.domain-search "{{ dhcpd_tpl_domain_search | join('", "') }}";
 
 {% endif %}
+{% set dhcpd_tpl_nameservers = [] %}
 {% if dhcpd_nameservers|d() and dhcpd_nameservers %}
 {% set dhcpd_tpl_nameservers = dhcpd_nameservers %}
 {% elif dhcpd_runtime_nameservers|d() and dhcpd_runtime_nameservers %}
-{% set dhcpd_tpl_nameservers = [] %}
 {% for server in dhcpd_runtime_nameservers %}
 {%   if server not in [ '127.0.0.1', '::1' ] %}
 {%     set _ = dhcpd_tpl_nameservers.append(server) %}