Merge pull request kubernetes-sigs#1146 from mattymo/resolvconf_optimize

Condense resolvconf sources before starting loop
includerandom · Mar 17, 2017 · 3cfb76e · 3cfb76e
2 parents 25bff85 + a520641
commit 3cfb76e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/roles/kubernetes/preinstall/tasks/resolvconf.yml b/roles/kubernetes/preinstall/tasks/resolvconf.yml
@@ -28,9 +28,8 @@
     backup: yes
     follow: yes
   with_nested:
-    - "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}"
+    - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
     - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
-  when: item[0] != ""
   notify: Preinstall | restart network
 
 - name: Remove search/domain/nameserver options after block
@@ -41,9 +40,8 @@
     backup: yes
     follow: yes
   with_nested:
-    - "{{ [resolvconffile] + [base|default('')] + [head|default('')] }}"
+    - "{{ [resolvconffile, base|default(''), head|default('')] | difference(['']) }}"
     - [ 'search ', 'nameserver ', 'domain ', 'options ' ]
-  when: item[0] != ""
   notify: Preinstall | restart network