Fix version parameters (#2588)

Signed-off-by: Christian Berendt <[email protected]>

Makefile

@@ -99,9 +99,9 @@ bootstrap: setup create ## Bootstrap everything.
 	  -e repo_path="$(PWD)/.src/$(shell contrib/setup-testbed.py --query "repository_server")" \
 	  -e manual_create=true \
 	  -e manual_deploy=true \
-	  -e version_ceph=$(VERSION_CEPH) \
-	  -e version_manager=$(VERSION_MANAGER) \
-	  -e version_openstack=$(VERSION_OPENSTACK) \
+	  -e ceph_version=$(VERSION_CEPH) \
+	  -e manager_version=$(VERSION_MANAGER) \
+	  -e openstack_version=$(VERSION_OPENSTACK) \
 	  -e ceph_stack=$(CEPH_STACK)
 
 .PHONY: manager

ansible/manager-part-1.yml

@@ -6,7 +6,7 @@
     ansible_ssh_user: dragon
     operator_user: dragon
     repo: osism/testbed
-    version_manager: latest
+    manager_version: latest
 
     venv_path: /opt/venv
 
@@ -120,7 +120,7 @@
     - name: Run manager part 2
       ansible.builtin.shell: |
         set -o pipefail
-        {{ ansible_playbook }} -i testbed-manager, -e version_manager={{ version_manager }} /opt/configuration/ansible/manager-part-2.yml | tee -a /opt/configuration/ansible/ansible-manager-part-2.log
+        {{ ansible_playbook }} -i testbed-manager, -e manager_version={{ manager_version }} /opt/configuration/ansible/manager-part-2.yml | tee -a /opt/configuration/ansible/ansible-manager-part-2.log
       args:
         executable: /bin/bash
       changed_when: true

ansible/manager-part-2.yml

@@ -4,47 +4,55 @@
   connection: local
 
   vars:
-    version_manager: latest
+    manager_version: latest
 
   tasks:
     - name: Set docker version facts for OSISM 6
       ansible.builtin.set_fact:
         __docker_version: "5:20.10.24"
         __docker_cli_version: "5:20.10.24"
       when:
-        - version_manager != "latest"
-        - version_manager is ansible.builtin.version("7.0.0", '<')
+        - manager_version != "latest"
+        - manager_version is ansible.builtin.version("7.0.0", '<')
 
     - name: Set docker version facts for OSISM 7 (<= 7.1.0)
       ansible.builtin.set_fact:
         __docker_version: "5:24.0.9"
         __docker_cli_version: "5:24.0.9"
       when:
-        - version_manager != "latest"
-        - version_manager is ansible.builtin.version("7.0.0", '>=')
-        - version_manager is ansible.builtin.version("7.1.0", '<=')
+        - manager_version != "latest"
+        - manager_version is ansible.builtin.version("7.0.0", '>=')
+        - manager_version is ansible.builtin.version("7.1.0", '<=')
 
     - name: Set docker version facts for OSISM 7 (>= 7.1.1)
       ansible.builtin.set_fact:
         __docker_version: "5:26.1.4"
         __docker_cli_version: "5:26.1.4"
       when:
-        - version_manager != "latest"
-        - version_manager is ansible.builtin.version("7.1.1", '>=')
+        - manager_version != "latest"
+        - manager_version is ansible.builtin.version("7.1.1", '>=')
 
     - name: Set docker version facts for OSISM latest
       ansible.builtin.set_fact:
         __docker_version: "5:27.4.1"
         __docker_cli_version: "5:27.4.1"
       when:
-        - version_manager == "latest"
+        - manager_version == "latest"
+
+    - name: Print used docker version
+      ansible.buitin.debug:
+        var: __docker_version
+
+    - name: Print used docker cli version
+      ansible.buitin.debug:
+        var: __docker_cli_version
 
 - name: Run manager part 2
   hosts: testbed-manager
   connection: local
 
   vars:
-    version_manager: latest
+    manager_version: latest
 
     docker_configure_repository: true
     docker_configure_storage_driver: true

playbooks/deploy.yml

@@ -36,6 +36,18 @@
     _terraform_environment: "{{ terraform_environment | default('ci-ubuntu-22.04') }}"
 
   tasks:
+    - name: Print used ceph version
+      ansible.builtin.debug:
+        var: _ceph_version
+
+    - name: Print used openstack version
+      ansible.builtin.debug:
+        var: _openstack_version
+
+    - name: Print used manager version
+      ansible.builtin.debug:
+        var: _manager_version
+
     - name: Set facts (Zuul deployment)
       ansible.builtin.set_fact:
         cloud: "{{ cloud_envs[hostvars[groups['all'][0]]['nodepool']['label']] }}"
@@ -173,7 +185,7 @@
             -e cloud={{ cloud }} \
             -e terraform_environment={{ _terraform_environment }} \
             -e repo_path={{ repo_path }} \
-            -e version_manager={{ _manager_version }} \
+            -e manager_version={{ _manager_version }} \
             manager-part-1.yml | tee -a ansible-manager-part-1.log
       args:
         executable: /bin/bash

playbooks/upgrade-stable.yml

@@ -24,6 +24,18 @@
     _openstack_version_next: "{{ openstack_version_next | default('2024.1') }}"
 
   tasks:
+    - name: Print next ceph version
+      ansible.builtin.debug:
+        var: _ceph_version_next
+
+    - name: Print next openstack version
+      ansible.builtin.debug:
+        var: _openstack_version_next
+
+    - name: Print next manager version
+      ansible.builtin.debug:
+        var: _manager_version_next
+
     - name: Set cloud fact (Zuul deployment)
       ansible.builtin.set_fact:
         cloud: "{{ cloud_envs[hostvars[groups['all'][0]]['nodepool']['label']] }}"

playbooks/upgrade.yml

@@ -28,6 +28,18 @@
     _openstack_version_next: "{{ openstack_version_next | default('2024.1') }}"
 
   tasks:
+    - name: Print next ceph version
+      ansible.builtin.debug:
+        var: _ceph_version_next
+
+    - name: Print next openstack version
+      ansible.builtin.debug:
+        var: _openstack_version_next
+
+    - name: Print next manager version
+      ansible.builtin.debug:
+        var: _manager_version_next
+
     - name: Set facts (Zuul deployment)
       ansible.builtin.set_fact:
         cloud: "{{ cloud_envs[hostvars[groups['all'][0]]['nodepool']['label']] }}"