From fd47d15196d1e453065b7ad039cc3598abf374ad Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Mon, 14 Oct 2024 11:32:49 -0700
Subject: [PATCH] Add clouds.yaml to zuul schedulers

Similar to I127ba4a2cf33f7ffcecdf81acfc5c38db565da82 we now need
to add the nodepool clouds.yaml to the zuul schedulers.  When validating
and generating the config for the launchers, they need to access the
clouds.yaml file to learn some information about the cloud (eg, image
format).  Therefore, they must have the same clouds.yaml that the
launchers use.

Change-Id: I4a7076e66c9f8eca936ca3a7902537d427a99323
---
 inventory/service/groups.yaml                            | 5 +++--
 playbooks/roles/zuul-scheduler/files/docker-compose.yaml | 1 +
 playbooks/service-zuul.yaml                              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 03517a16e3..26d9a5725a 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -116,9 +116,10 @@ groups:
   nodepool:
     - nb[0-9]*.opendev.org
     - nl[0-9]*.open*.org
-    # Add the zuul-launchers so they have access to the clouds.yaml
-    # related group-vars.
+    # Add the zuul-launchers and schedulers so they have access to the
+    # clouds.yaml related group-vars.
     - zl[0-9]*.opendev.org
+    - zuul[0-9]*.opendev.org
   nodepool-builder:
     - nb[0-9]*.opendev.org
   nodepool-launcher:
diff --git a/playbooks/roles/zuul-scheduler/files/docker-compose.yaml b/playbooks/roles/zuul-scheduler/files/docker-compose.yaml
index eb68e8293b..e4b8695fb3 100644
--- a/playbooks/roles/zuul-scheduler/files/docker-compose.yaml
+++ b/playbooks/roles/zuul-scheduler/files/docker-compose.yaml
@@ -10,6 +10,7 @@ services:
     user: zuul
     volumes:
       - /etc/zuul:/etc/zuul
+      - /etc/openstack:/etc/openstack
       - /opt/project-config:/opt/project-config
       - /home/zuuld:/home/zuul
       - /var/lib/zuul:/var/lib/zuul
diff --git a/playbooks/service-zuul.yaml b/playbooks/service-zuul.yaml
index e39a6133e3..9478218749 100644
--- a/playbooks/service-zuul.yaml
+++ b/playbooks/service-zuul.yaml
@@ -37,5 +37,6 @@
 - hosts: "zuul-scheduler:!disabled"
   name: "Configure zuul scheduler"
   roles:
+    - configure-openstacksdk
     - zuul-scheduler
     - zuul-web