From ebd0c6fce3348735536c026498af86386aab4a2a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 16 Feb 2024 11:13:30 +0100 Subject: [PATCH] kickoff squid This adds the few required changes in order to fully support Ceph Squid. Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 2 +- infrastructure-playbooks/rolling_update.yml | 4 ++-- roles/ceph-container-common/tasks/release.yml | 5 +++++ roles/ceph-defaults/defaults/main.yml | 2 +- tests/conftest.py | 1 + tox-subset_update.ini | 2 +- tox-update.ini | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index b13d243df..f24d46b5a 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -155,7 +155,7 @@ dummy: # #ceph_mirror: https://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: reef +#ceph_stable_release: squid #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 01dc0d35b..2bcb73cf7 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -1158,7 +1158,7 @@ name: ceph-facts tasks_from: container_binary.yml - - name: Container | disallow pre-reef OSDs and enable all new reef-only functionality + - name: Container | disallow pre-squid OSDs and enable all new squid-only functionality ansible.builtin.command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_facts']['hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release squid" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true @@ -1167,7 +1167,7 @@ - containerized_deployment | bool - groups.get(mon_group_name, []) | length > 0 - - name: Non container | disallow pre-reef OSDs and enable all new reef-only functionality + - name: Non container | disallow pre-squid OSDs and enable all new squid-only functionality ansible.builtin.command: "ceph --cluster {{ cluster }} osd require-osd-release squid" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true diff --git a/roles/ceph-container-common/tasks/release.yml b/roles/ceph-container-common/tasks/release.yml index 34b936192..0db7fe4b1 100644 --- a/roles/ceph-container-common/tasks/release.yml +++ b/roles/ceph-container-common/tasks/release.yml @@ -43,3 +43,8 @@ ansible.builtin.set_fact: ceph_release: reef when: ceph_version.split('.')[0] is version('18', '==') + +- name: Set_fact ceph_release squid + ansible.builtin.set_fact: + ceph_release: squid + when: ceph_version.split('.')[0] is version('19', '==') diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 8f483b989..7e2b94f28 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -147,7 +147,7 @@ valid_ceph_repository: # ceph_mirror: https://download.ceph.com ceph_stable_key: https://download.ceph.com/keys/release.asc -ceph_stable_release: reef +ceph_stable_release: squid ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/tests/conftest.py b/tests/conftest.py index abed775c5..9a12727dc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -144,6 +144,7 @@ def node(host, request): 'pacific': 16, 'quincy': 17, 'reef': 18, + 'squid': 19, 'dev': 99 } diff --git a/tox-subset_update.ini b/tox-subset_update.ini index a5b556e5c..52ab59840 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -119,6 +119,6 @@ commands= " - 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" + bash -c "CEPH_STABLE_RELEASE=squid 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 9e74b141a..a35e1a2f5 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=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" + bash -c "CEPH_STABLE_RELEASE=squid 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