zuul: use quay.io for jobs running on external clouds (osism#1758)

Signed-off-by: Christian Berendt <[email protected]>
Nils98Ar · Sep 17, 2023 · f45d8c4 · f45d8c4
1 parent b231138
commit f45d8c4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -116,31 +116,49 @@
     name: testbed-deploy-cleura
     parent: testbed-abstract-deploy
     nodeset: testbed-orchestrator-cleura
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - job:
     name: testbed-deploy-pco
     parent: testbed-abstract-deploy
     nodeset: testbed-orchestrator-pco
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - job:
     name: testbed-deploy-wavestack
     parent: testbed-abstract-deploy
     nodeset: testbed-orchestrator-wavestack
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - job:
     name: testbed-upgrade-cleura
     parent: testbed-upgrade
     nodeset: testbed-orchestrator-cleura
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - job:
     name: testbed-upgrade-pco
     parent: testbed-upgrade
     nodeset: testbed-orchestrator-pco
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - job:
     name: testbed-upgrade-wavestack
     parent: testbed-upgrade
     nodeset: testbed-orchestrator-wavestack
+    vars:
+      docker_registry: quay.io
+      docker_namespace_kolla: osism
 
 - project:
     merge-mode: squash-merge

diff --git a/ansible/manager-part-1.yml b/ansible/manager-part-1.yml
@@ -6,7 +6,7 @@
   vars:
     ansible_ssh_user: dragon
     docker_namespace_kolla: kolla
-    docker_registry_zuul: osism.harbor.regio.digital
+    docker_registry: osism.harbor.regio.digital
     operator_user: dragon
     repo_path: /home/ubuntu/src/github.com
     version_manager: latest
@@ -62,7 +62,7 @@
     - name: Set container registries
       ansible.builtin.command:  # noqa: command-instead-of-module
         chdir: /opt/configuration
-        cmd: "sed -i 's#{{ item }}: .*#{{ item }}: {{ docker_registry_zuul }}#g' /opt/configuration/environments/configuration.yml"
+        cmd: "sed -i 's#{{ item }}: .*#{{ item }}: {{ docker_registry }}#g' /opt/configuration/environments/configuration.yml"
       changed_when: true
       # docker_registry is not changed because the images are not provided by us
       with_items:

diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml
@@ -19,6 +19,9 @@
     version_manager: "{{ manager_version | default('latest') }}"
     version_openstack: "{{ openstack_version | default('2023.1') }}"
 
+    zuul_docker_namespace_kolla: "{{ docker_namespace_kolla | default('kolla') }}"
+    zuul_docker_registry: "{{ docker_registry | default('osism.harbor.regio.digital') }}"
+
     run_bootstrap: true
     run_checks: true
     run_refstack: "{{ refstack | default(false) | bool }}"
@@ -125,7 +128,7 @@
       ansible.builtin.shell:
         chdir: "{{ ansible_path }}"
         cmd: |
-          {{ ansible_playbook }} -i {{ terraform_path }}/inventory.{{ cloud_env }} --key-file {{ terraform_path }}/.id_rsa.{{ cloud_env }} manager-part-1.yml -e cloud_env={{ cloud_env }} -e repo_path={{ repo_path }} -e version_manager={{ version_manager }}
+          {{ ansible_playbook }} -i {{ terraform_path }}/inventory.{{ cloud_env }} --key-file {{ terraform_path }}/.id_rsa.{{ cloud_env }} manager-part-1.yml -e cloud_env={{ cloud_env }} -e repo_path={{ repo_path }} -e version_manager={{ version_manager }} -e docker_registry={{ zuul_docker_registry }} -e docker_namespace_kolla={{ zuul_docker_namespace_kolla }}
       changed_when: true
 
     - name: Deploy manager + bootstrap nodes

diff --git a/scripts/set-docker-registry.sh b/scripts/set-docker-registry.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+DOCKER_REGISTRY=${1:-quay.io}
+
+sed -i "s#docker_registry_ansible: .*#docker_registry_ansible: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml
+sed -i "s#docker_registry_kolla: .*#docker_registry_kolla: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml
+sed -i "s#docker_registry_netbox: .*#docker_registry_netbox: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml
+sed -i "s#ceph_docker_registry: .*#ceph_docker_registry: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml