Use openstack 2023.1 by default (osism#1744)

Signed-off-by: Christian Berendt <[email protected]>
Nils98Ar · Sep 14, 2023 · 3cc9599 · 3cc9599
1 parent 9cd2416
commit 3cc9599
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ENVIRONMENT ?= regiocloud
 
 VERSION_CEPH ?= quincy
 VERSION_MANAGER ?= latest
-VERSION_OPENSTACK ?= zed
+VERSION_OPENSTACK ?= 2023.1
 
 TERRAFORM ?= terraform
 TERRAFORM_BLUEPRINT ?= testbed-default

diff --git a/environments/manager/configuration.yml b/environments/manager/configuration.yml
@@ -4,7 +4,7 @@
 
 ceph_version: quincy
 manager_version: latest
-openstack_version: zed
+openstack_version: 2023.1
 
 ##########################
 # listener

diff --git a/environments/manager/images.yml b/environments/manager/images.yml
@@ -55,5 +55,5 @@ traefik_image: "{{ docker_registry }}/library/traefik:{{ traefik_tag }}"
 ceph_ansible_tag: "{{ ceph_version|default('quincy') }}"
 ceph_ansible_image: "{{ docker_registry_ansible|default('quay.io') }}/osism/ceph-ansible:{{ ceph_ansible_tag }}"
 
-kolla_ansible_tag: "{{ openstack_version|default('zed') }}"
+kolla_ansible_tag: "{{ openstack_version|default('2023.1') }}"
 kolla_ansible_image: "{{ docker_registry_ansible|default('quay.io') }}/osism/kolla-ansible:{{ kolla_ansible_tag }}"
diff --git a/playbooks/upgrade-stable.yml b/playbooks/upgrade-stable.yml
@@ -16,7 +16,7 @@
 
     version_manager_next: "{{ manager_version_next | default('latest') }}"
     version_ceph_next: "{{ ceph_version_next | default('quincy') }}"
-    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/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('zed') }}"
+    version_openstack: "{{ openstack_version | default('2023.1') }}"
     namespace_kolla: "{{ docker_namespace_kolla | default('kolla') }}"
 
     run_bootstrap: false

diff --git a/scripts/set-openstack-version.sh b/scripts/set-openstack-version.sh
@@ -2,7 +2,7 @@
 set -x
 set -e
 
-VERSION=${1:-zed}
+VERSION=${1:-2023.1}
 
 if [[ "$(grep '^openstack_version:' /opt/configuration/environments/manager/configuration.yml)" ]]; then
     sed -i "s/openstack_version: .*/openstack_version: ${VERSION}/g" /opt/configuration/environments/manager/configuration.yml

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
@@ -8,7 +8,7 @@ echo
 
 export MANAGER_VERSION=${1:-latest}
 CEPH_VERSION=${2:-quincy}
-OPENSTACK_VERSION=${3:-zed}
+OPENSTACK_VERSION=${3:-2023.1}
 KOLLA_NAMESPACE=${4:-kolla}
 
 /opt/configuration/scripts/set-manager-version.sh $MANAGER_VERSION

diff --git a/terraform/Makefile b/terraform/Makefile
@@ -15,7 +15,7 @@ STATE = errored.tfstate
 
 VERSION_CEPH ?= quincy
 VERSION_MANAGER ?= latest
-VERSION_OPENSTACK ?= zed
+VERSION_OPENSTACK ?= 2023.1
 
 KOLLA_NAMESPACE ?= kolla