From: David Galloway <david.galloway@ibm.com>
Date: Fri, 12 Dec 2025 16:22:11 +0000 (-0500)
Subject: builder: Fix and combine Sepia-specific tasks
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a176f66f7950d750fc47b072f2bc0fcc1e50324;p=ceph-build.git

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 d1b2dfaf..612b21e7 100644
--- 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