builder: Fix and combine Sepia-specific tasks

Forgot to add 10.20 to the nodename task

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ansible/examples/builder.yml b/ansible/examples/builder.yml
index d1b2dfaf1911beb547ee1b46e8841da95e2e2745..612b21e7487ff7ded9a718877b9aa4bcfc0f9cc5 100644 (file)
--- a/ansible/examples/builder.yml
+++ b/ansible/examples/builder.yml
@@ -432,18 +432,13 @@
         - libvirt|bool
       tags: always
 
-    ## Let's make sure we don't accidentally set up a permanent builder from Sepia as ephemeral
-    - set_fact:
-        permanent: true
-      with_items: "{{ ansible_all_ipv4_addresses }}"
-      when: item | regex_search('^(172\\.21\\.|8\\.43\\.|10\\.20\\.)')
-      tags: always
-
+    ## Let's make sure we don't accidentally set up a permanent builder from Sepia as ephemeral and
     ## Let's make sure nodename gets set using our Sepia hostnames if the builder's in Sepia
     - set_fact:
+        permanent: true
         nodename: "{{ ansible_hostname }}"
       with_items: "{{ ansible_all_ipv4_addresses }}"
-      when: "item.startswith('172.21.') or item.startswith('8.43')"
+      when: item | regex_search('^(172\\.21\\.|8\\.43\\.|10\\.20\\.)')
       tags: always
 
     ## EPHEMERAL SLAVE TASKS