diff --git a/inventory/service/group_vars/zuul.yaml b/inventory/service/group_vars/zuul.yaml index cf094e6802..0450072123 100644 --- a/inventory/service/group_vars/zuul.yaml +++ b/inventory/service/group_vars/zuul.yaml @@ -45,3 +45,13 @@ zuul_connections: user: 'git-infra-root.openstack.org' stream_events: 'false' auth_type: 'basic' + + - name: 'raxflex' + driver: 'openstack' + +openstacksdk_config_dir: /etc/openstack +openstacksdk_config_owner: root +openstacksdk_config_group: "{{ zuul_group }}" +# This filename is correct: while we have both nodepool and +# zuul-launcher, they share the same clouds.yaml file. +openstacksdk_config_template: clouds/nodepool_clouds.yaml.j2 diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index b7f2d6cda7..03517a16e3 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -116,6 +116,9 @@ 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. + - zl[0-9]*.opendev.org nodepool-builder: - nb[0-9]*.opendev.org nodepool-launcher: diff --git a/playbooks/roles/zuul-launcher/files/docker-compose.yaml b/playbooks/roles/zuul-launcher/files/docker-compose.yaml index d5e9006ddf..61c8ad8731 100644 --- a/playbooks/roles/zuul-launcher/files/docker-compose.yaml +++ b/playbooks/roles/zuul-launcher/files/docker-compose.yaml @@ -10,6 +10,7 @@ services: user: zuul volumes: - /etc/zuul:/etc/zuul + - /etc/openstack:/etc/openstack - /home/zuuld:/home/zuul - /var/lib/zuul:/var/lib/zuul - /var/log/zuul:/var/log/zuul diff --git a/playbooks/service-zuul.yaml b/playbooks/service-zuul.yaml index 02014d7a20..e39a6133e3 100644 --- a/playbooks/service-zuul.yaml +++ b/playbooks/service-zuul.yaml @@ -18,6 +18,7 @@ - hosts: "zuul-launcher:!disabled" name: "Configure zuul launcher" roles: + - configure-openstacksdk - zuul-launcher - hosts: "zuul-merger:!disabled"