common: v18/reef kickoff

align with ceph/ceph/pull/47458 since it has been merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/7333/head
Guillaume Abrioux 2022-10-07 10:49:00 +02:00
parent d60c486cc4
commit 371592a8fb
11 changed files with 28 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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', '==')

View File

@ -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', '==')

View File

@ -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

View File

@ -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']

View File

@ -114,6 +114,7 @@ def node(host, request):
'octopus': 15,
'pacific': 16,
'quincy': 17,
'reef': 18,
'dev': 99
}

View File

@ -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

View File

@ -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

View File

@ -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