Prepare for 6.0.0a (pt. 1) (#1725)

Not many changes in Ceph. In order to see errors in the Kolla more quickly, the basic infra services are deployed before. Signed-off-by: Christian Berendt <[email protected]>
osism · Sep 4, 2023 · bc7cb87 · bc7cb87
1 parent ede1f7b
commit bc7cb87
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -183,3 +183,4 @@
         - ansible-lint
         - yamllint
         - flake8
+
diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml
@@ -17,7 +17,7 @@
 
     version_ceph: "{{ ceph_version | default('quincy') }}"
     version_manager: "{{ manager_version | default('latest') }}"
-    version_openstack: "{{ openstack_version | default('zed') }}"
+    version_openstack: "{{ openstack_version | default('2023.1') }}"
 
     run_bootstrap: true
     run_checks: true

diff --git a/playbooks/upgrade.yml b/playbooks/upgrade.yml
@@ -4,7 +4,7 @@
   vars:
     version_ceph: "{{ ceph_version | default('pacific') }}"
     version_manager: "{{ manager_version | default('latest') }}"
-    version_openstack: "{{ openstack_version | default('yoga') }}"
+    version_openstack: "{{ openstack_version | default('zed') }}"
     namespace_kolla: "{{ docker_namespace_kolla | default('kolla') }}"
 
     run_bootstrap: false
@@ -20,7 +20,7 @@
 
     version_ceph_next: "{{ ceph_version_next | default('quincy') }}"
     version_manager_next: "{{ manager_version_next | default('latest') }}"
-    version_openstack_next: "{{ openstack_version_next | default('zed') }}"
+    version_openstack_next: "{{ openstack_version_next | default('2023.1') }}"
     namespace_kolla_next: "{{ docker_namespace_kolla_next | default('kolla') }}"
 
     run_bootstrap: true

diff --git a/scripts/deploy-services.sh b/scripts/deploy-services.sh
@@ -14,9 +14,10 @@ sh -c '/opt/configuration/scripts/000-pull-images.sh'
 # deploy helper services
 sh -c '/opt/configuration/scripts/deploy/001-helper-services.sh'
 
+sh -c '/opt/configuration/scripts/deploy/200-infrastructure-services-basic.sh'
+
 sh -c '/opt/configuration/scripts/deploy/100-ceph-services-basic.sh'
 
-sh -c '/opt/configuration/scripts/deploy/200-infrastructure-services-basic.sh'
 sh -c '/opt/configuration/scripts/deploy/300-openstack-services-basic.sh'
 
 if [[ "$REFSTACK" == "false" ]]; then

diff --git a/scripts/upgrade-services.sh b/scripts/upgrade-services.sh
@@ -5,12 +5,12 @@ set -e
 # pull images
 sh -c '/opt/configuration/scripts/000-pull-images.sh'
 
-# upgrade ceph services
-sh -c '/opt/configuration/scripts/upgrade/100-ceph-services.sh'
-
 # upgrade infrastructure services
 sh -c '/opt/configuration/scripts/upgrade/200-infrastructure-services-basic.sh'
 
+# upgrade ceph services
+sh -c '/opt/configuration/scripts/upgrade/100-ceph-services.sh'
+
 # upgrade openstack services
 sh -c '/opt/configuration/scripts/upgrade/300-openstack-services-basic.sh'
 sh -c '/opt/configuration/scripts/upgrade/310-openstack-services-extended.sh'