Reset Kolla namespace to kolla when upgrading stable to current

When a stable release is deployed, the Kolla docker_namespace is set to
kolla/release/<openstack_version> (>= 10.0.0) or kolla/release. When the
testbed is then updated/upgraded to current (latest), this namespace must
be reset to kolla again, otherwise image pulls fail with e.g.

  artifact kolla/release/2025.1/fluentd:2025.1 not found

The previous logic in upgrade-manager.sh derived the namespace from the
KOLLA_NAMESPACE parameter passed by the playbook (guarded on
== "kolla/release") and never reset it to kolla for the latest target:

- update-stable.yml passes "kolla", but it was only set without --sync and
  never synced, so the stale kolla/release/<version> stayed active.
- upgrade-stable.yml passes "kolla/release", which for a latest target
  produced kolla/release/<version> instead of kolla.

Derive the namespace from the target manager version instead (mirroring
deploy/000-manager.sh) and always apply it with --sync:

- latest           -> kolla
- stable >= 10.0.0 -> kolla/release/<openstack_version>
- stable <  10.0.0 -> kolla/release

This fixes testbed-update-stable-current-ubuntu-24.04 and
testbed-upgrade-stable-next-ubuntu-24.04 without changing the behaviour of
the stable-to-stable upgrade/update jobs.

Assisted-By: Claude:claude-opus-4-8
Signed-off-by: Christian Berendt <berendt@osism.tech>

Author: berendt

.zuul.yaml

@@ -111,7 +111,7 @@
 # 2.4 Abstract Jobs for Upgrade/Update Operations
 # -----------------------------------------------------------------------------
 
-# Update: Minor version update (e.g., 9.4.0 -> 9.5.0)
+# Update: Minor version update (e.g., X.1.0 -> X.2.0)
 - job:
     name: abstract-testbed-update-stable
     abstract: true
@@ -120,7 +120,7 @@
     nodeset: testbed-orchestrator
     timeout: 30000
 
-# Upgrade: Major version upgrade (e.g., 9.5.0 -> 10.1.0)
+# Upgrade: Major version upgrade (e.g., X.1.0 -> Y.1.0)
 - job:
     name: abstract-testbed-upgrade-stable
     abstract: true
@@ -256,19 +256,19 @@
     timeout: 30000
 
 # -----------------------------------------------------------------------------
-# 4.2 Update Jobs (Minor Version: 9.4.0 -> 9.5.0)
+# 4.2 Update Jobs (Minor Version: X.1.0 -> X.2.0)
 # -----------------------------------------------------------------------------
 
 - job:
     name: testbed-update-stable-ubuntu-24.04
     parent: abstract-testbed-update-stable
     vars:
       terraform_environment: ubuntu-24.04
-      manager_version: 9.4.0
-      manager_version_next: 9.5.0
+      manager_version: 10.1.0
+      manager_version_next: 10.2.0
 
 # -----------------------------------------------------------------------------
-# 4.3 Upgrade Jobs (Major Version: 9.5.0 -> 10.1.0)
+# 4.3 Upgrade Jobs (Major Version: X.1.0 -> Y.1.0)
 # -----------------------------------------------------------------------------
 
 - job:
@@ -300,7 +300,7 @@
     nodeset: testbed-orchestrator
     timeout: 30000
     vars:
-      manager_version: 9.5.0
+      manager_version: 10.1.0
       ceph_version_next: skip
       manager_version_next: latest
       openstack_version_next: "2025.1"
@@ -312,10 +312,10 @@
     nodeset: testbed-orchestrator
     timeout: 30000
     vars:
-      manager_version: 9.5.0
+      manager_version: 10.1.0
       ceph_version_next: skip
       manager_version_next: latest
-      openstack_version_next: "2025.1"
+      openstack_version_next: "2025.2"
 
 # =============================================================================
 # 5. PROJECT PIPELINE DEFINITION

scripts/upgrade-manager.sh

@@ -87,11 +87,19 @@ fi
 # refresh facts
 osism apply facts
 
-if [[ $KOLLA_NAMESPACE == "kolla/release" ]]; then
-    if [[ $MANAGER_VERSION != "latest" || $OPENSTACK_VERSION == "skip" ]]; then
-        OPENSTACK_VERSION=$(docker inspect --format '{{ index .Config.Labels "de.osism.release.openstack"}}' kolla-ansible)
-    fi
-    if [[ $MANAGER_VERSION == "latest" || $(semver $MANAGER_VERSION 10.0.0-0) -ge 0 ]]; then
-        /opt/configuration/scripts/set-kolla-namespace.sh --sync "kolla/release/$OPENSTACK_VERSION"
-    fi
+# Set the Kolla namespace to match the target version. The namespace must be
+# derived from the target manager version, not from the namespace that was used
+# before the upgrade/update:
+#   - current (latest): images live in kolla. When coming from a stable release
+#     the release/<openstack_version> part must be removed again.
+#   - stable >= 10.0.0: images live in kolla/release/<openstack_version>.
+#   - stable <  10.0.0: images live in kolla/release.
+# --sync makes the new namespace effective for the following service upgrade.
+if [[ $MANAGER_VERSION == "latest" ]]; then
+    /opt/configuration/scripts/set-kolla-namespace.sh --sync kolla
+elif [[ $(semver $MANAGER_VERSION 10.0.0-0) -ge 0 ]]; then
+    OPENSTACK_VERSION=$(docker inspect --format '{{ index .Config.Labels "de.osism.release.openstack"}}' kolla-ansible)
+    /opt/configuration/scripts/set-kolla-namespace.sh --sync "kolla/release/$OPENSTACK_VERSION"
+else
+    /opt/configuration/scripts/set-kolla-namespace.sh --sync kolla/release
 fi