From 371592a8fb1896183aa1b55de9963f7b9a4d24f3 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 7 Oct 2022 10:49:00 +0200 Subject: [PATCH] common: v18/reef kickoff align with ceph/ceph/pull/47458 since it has been merged. Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 3 ++- group_vars/rhcs.yml.sample | 3 ++- infrastructure-playbooks/rolling_update.yml | 12 ++++++------ roles/ceph-common/tasks/release-rhcs.yml | 5 +++++ roles/ceph-container-common/tasks/release.yml | 5 +++++ roles/ceph-defaults/defaults/main.yml | 3 ++- roles/ceph-validate/tasks/check_repository.yml | 4 ++-- tests/conftest.py | 1 + tox-filestore_to_bluestore.ini | 2 +- tox-subset_update.ini | 2 +- tox-update.ini | 2 +- 11 files changed, 28 insertions(+), 14 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index b67a73bdf..4b63ad5c6 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -31,6 +31,7 @@ dummy: # octopus: 15 # pacific: 16 # quincy: 17 +# reef: 18 # dev: 99 @@ -157,7 +158,7 @@ dummy: # #ceph_mirror: https://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: reef #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 8f204ccd3..67eee22a4 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -31,6 +31,7 @@ dummy: # octopus: 15 # pacific: 16 # quincy: 17 +# reef: 18 # dev: 99 @@ -157,7 +158,7 @@ ceph_repository: rhcs # #ceph_mirror: https://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: reef #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index b9feaac7a..c58e177d9 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -133,8 +133,8 @@ - name: check ceph release being deployed fail: - msg: "This version of ceph-ansible is intended for upgrading to Ceph Quincy only." - when: "'quincy' not in ceph_version.stdout.split()" + msg: "This version of ceph-ansible is intended for upgrading to Ceph Reef only." + when: "'reef' not in ceph_version.stdout.split()" - name: upgrade ceph mon cluster @@ -1049,16 +1049,16 @@ name: ceph-facts tasks_from: container_binary.yml - - name: container | disallow pre-quincy OSDs and enable all new quincy-only functionality - command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_facts']['hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release quincy" + - name: container | disallow pre-reef OSDs and enable all new reef-only functionality + command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_facts']['hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release reef" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True when: - containerized_deployment | bool - groups.get(mon_group_name, []) | length > 0 - - name: non container | disallow pre-quincy OSDs and enable all new quincy-only functionality - command: "ceph --cluster {{ cluster }} osd require-osd-release quincy" + - name: non container | disallow pre-reef OSDs and enable all new reef-only functionality + command: "ceph --cluster {{ cluster }} osd require-osd-release reef" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True when: diff --git a/roles/ceph-common/tasks/release-rhcs.yml b/roles/ceph-common/tasks/release-rhcs.yml index 7b4808e38..fbe1d7aa1 100644 --- a/roles/ceph-common/tasks/release-rhcs.yml +++ b/roles/ceph-common/tasks/release-rhcs.yml @@ -38,3 +38,8 @@ set_fact: ceph_release: quincy when: ceph_version.split('.')[0] is version('17', '==') + +- name: set_fact ceph_release reef + set_fact: + ceph_release: reef + when: ceph_version.split('.')[0] is version('18', '==') diff --git a/roles/ceph-container-common/tasks/release.yml b/roles/ceph-container-common/tasks/release.yml index 7b4808e38..fbe1d7aa1 100644 --- a/roles/ceph-container-common/tasks/release.yml +++ b/roles/ceph-container-common/tasks/release.yml @@ -38,3 +38,8 @@ set_fact: ceph_release: quincy when: ceph_version.split('.')[0] is version('17', '==') + +- name: set_fact ceph_release reef + set_fact: + ceph_release: reef + when: ceph_version.split('.')[0] is version('18', '==') diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 854f761e7..c4b401562 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -23,6 +23,7 @@ ceph_release_num: octopus: 15 pacific: 16 quincy: 17 + reef: 18 dev: 99 @@ -149,7 +150,7 @@ valid_ceph_repository: # ceph_mirror: https://download.ceph.com ceph_stable_key: https://download.ceph.com/keys/release.asc -ceph_stable_release: quincy +ceph_stable_release: reef ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/roles/ceph-validate/tasks/check_repository.yml b/roles/ceph-validate/tasks/check_repository.yml index e7d566316..89d74ffa9 100644 --- a/roles/ceph-validate/tasks/check_repository.yml +++ b/roles/ceph-validate/tasks/check_repository.yml @@ -12,8 +12,8 @@ - name: validate ceph_repository_community fail: - msg: "ceph_stable_release must be 'quincy'" + msg: "ceph_stable_release must be 'reef'" when: - ceph_origin == 'repository' - ceph_repository == 'community' - - ceph_stable_release not in ['quincy'] + - ceph_stable_release not in ['reef'] diff --git a/tests/conftest.py b/tests/conftest.py index 42e37ca1d..70e2345db 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -114,6 +114,7 @@ def node(host, request): 'octopus': 15, 'pacific': 16, 'quincy': 17, + 'reef': 18, 'dev': 99 } diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index a5af975de..8c29eeed1 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -62,6 +62,6 @@ commands= ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ " - bash -c "CEPH_STABLE_RELEASE=quincy py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" + bash -c "CEPH_STABLE_RELEASE=reef py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" vagrant destroy --force diff --git a/tox-subset_update.ini b/tox-subset_update.ini index f146f9288..17dffea10 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -119,6 +119,6 @@ commands= " - bash -c "CEPH_STABLE_RELEASE=quincy py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" + bash -c "CEPH_STABLE_RELEASE=reef py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" vagrant destroy --force diff --git a/tox-update.ini b/tox-update.ini index cb39b140f..77771026c 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -77,6 +77,6 @@ commands= ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - bash -c "CEPH_STABLE_RELEASE=quincy py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" + bash -c "CEPH_STABLE_RELEASE=reef py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" vagrant destroy --force