Use the local registry in the nutshell deployment (#2473)

Signed-off-by: Christian Berendt <[email protected]>
osism · Sep 19, 2024 · 2a99acf · 2a99acf
1 parent a66d832
commit 2a99acf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/scripts/deploy-in-a-nutshell.sh b/scripts/deploy-in-a-nutshell.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# do not use the local registry
-sh -c '/opt/configuration/scripts/set-docker-registry.sh'
-
 # pull images
 sh -c '/opt/configuration/scripts/pull-images.sh'
 

diff --git a/scripts/set-docker-registry.sh b/scripts/set-docker-registry.sh
@@ -2,6 +2,8 @@
 set -x
 set -e
 
+source /opt/manager-vars.sh
+
 DOCKER_REGISTRY=${1:-osism.harbor.regio.digital}
 
 sed -i "s#ceph_docker_registry: .*#ceph_docker_registry: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml
@@ -10,5 +12,9 @@ sed -i "s#docker_registry_kolla: .*#docker_registry_kolla: ${DOCKER_REGISTRY}#g"
 sed -i "s#docker_registry_netbox: .*#docker_registry_netbox: ${DOCKER_REGISTRY}#g" /opt/configuration/environments/configuration.yml
 
 if [[ "$DOCKER_REGISTRY" == "osism.harbor.regio.digital" ]]; then
-    sed -i "s/docker_namespace: osism/docker_namespace: kolla/" /opt/configuration/environments/kolla/configuration.yml
+    if [[ "$MANAGER_VERSION" == "latest" ]]; then
+        sed -i "s#docker_namespace: osism#docker_namespace: kolla#" /opt/configuration/environments/kolla/configuration.yml
+    else
+        sed -i "s#docker_namespace: osism#docker_namespace: kolla/release#" /opt/configuration/environments/kolla/configuration.yml
+    fi
 fi