Skip to content

Commit e26e0e2

Browse files
authoredSep 2, 2024
Use OpenStack 2024.1 by default (osism#2434)
Signed-off-by: Christian Berendt <[email protected]>
1 parent 9df9112 commit e26e0e2

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed
 

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IMAGE_USERNAME ?= ubuntu
99

1010
VERSION_CEPH ?= quincy
1111
VERSION_MANAGER ?= latest
12-
VERSION_OPENSTACK ?= 2023.2
12+
VERSION_OPENSTACK ?= 2024.1
1313

1414
CEPH_STACK ?= ceph-ansible
1515

‎environments/manager/configuration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
ceph_version: quincy
66
manager_version: latest
7-
openstack_version: 2023.2
7+
openstack_version: 2024.1
88

99
##########################
1010
# listener

‎environments/manager/images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ traefik_image: "{{ docker_registry }}/library/traefik:{{ traefik_tag }}"
5454
ceph_ansible_tag: "{{ ceph_version|default('quincy') }}"
5555
ceph_ansible_image: "{{ docker_registry_ansible|default('quay.io') }}/osism/ceph-ansible:{{ ceph_ansible_tag }}"
5656

57-
kolla_ansible_tag: "{{ openstack_version|default('2023.2') }}"
57+
kolla_ansible_tag: "{{ openstack_version|default('2024.1') }}"
5858
kolla_ansible_image: "{{ docker_registry_ansible|default('quay.io') }}/osism/kolla-ansible:{{ kolla_ansible_tag }}"

‎playbooks/deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
_ceph_version: "{{ ceph_version | default('quincy') }}"
2727
_manager_version: "{{ manager_version | default('latest') }}"
28-
_openstack_version: "{{ openstack_version | default('2023.2') }}"
28+
_openstack_version: "{{ openstack_version | default('2024.1') }}"
2929

3030
_nutshell: "{{ nutshell | default(false) | bool }}"
3131
_tempest: "{{ tempest | default(false) | bool }}"

‎playbooks/upgrade-stable.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
_manager_version_next: "{{ manager_version_next | default('latest') }}"
2323
_ceph_version_next: "{{ ceph_version_next | default('quincy') }}"
24-
_openstack_version_next: "{{ openstack_version_next | default('2023.2') }}"
24+
_openstack_version_next: "{{ openstack_version_next | default('2024.1') }}"
2525

2626
tasks:
2727
- name: Set cloud fact (Zuul deployment)

‎playbooks/upgrade.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
_ceph_version: "{{ ceph_version | default('pacific') }}"
66
_manager_version: "{{ manager_version | default('latest') }}"
7-
_openstack_version: "{{ openstack_version | default('2023.1') }}"
7+
_openstack_version: "{{ openstack_version | default('2023.2') }}"
88

99
- name: Upgrade testbed
1010
hosts: all
@@ -25,7 +25,7 @@
2525

2626
_ceph_version_next: "{{ ceph_version_next | default('quincy') }}"
2727
_manager_version_next: "{{ manager_version_next | default('latest') }}"
28-
_openstack_version_next: "{{ openstack_version_next | default('2023.2') }}"
28+
_openstack_version_next: "{{ openstack_version_next | default('2024.1') }}"
2929

3030
tasks:
3131
- name: Set facts (Zuul deployment)

‎scripts/set-openstack-version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -x
33
set -e
44

5-
VERSION=${1:-2023.2}
5+
VERSION=${1:-2024.1}
66

77
if [[ "$(grep '^openstack_version:' /opt/configuration/environments/manager/configuration.yml)" ]]; then
88
sed -i "s/openstack_version: .*/openstack_version: ${VERSION}/g" /opt/configuration/environments/manager/configuration.yml

‎scripts/upgrade.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo
1212

1313
export MANAGER_VERSION=${1:-latest}
1414
CEPH_VERSION=${2:-quincy}
15-
OPENSTACK_VERSION=${3:-2023.2}
15+
OPENSTACK_VERSION=${3:-2024.1}
1616
KOLLA_NAMESPACE=${4:-osism}
1717

1818
/opt/configuration/scripts/set-manager-version.sh $MANAGER_VERSION

‎terraform/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ STATE = errored.tfstate
1818
CEPH_STACK ?= ceph-ansible
1919
VERSION_CEPH ?= quincy
2020
VERSION_MANAGER ?= latest
21-
VERSION_OPENSTACK ?= 2023.2
21+
VERSION_OPENSTACK ?= 2024.1
2222

2323
KOLLA_NAMESPACE ?= osism
2424

0 commit comments

Comments
 (0)