kickoff squid

This adds the few required changes in order to fully support
Ceph Squid.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b13d243dffa9c13bc19a92a99f6ac3299cf1d36a..f24d46b5a13626a13c141fb9fb88b960e7d8e361 100644 (file)
--- 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 01dc0d35b0286fc53ffff35eb3849cfc87705a5a..2bcb73cf780216990e03c90498d23d786a040f8d 100644 (file)
--- 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 34b936192edc7a156d8d9dcc7b16c07909430212..0db7fe4b1ee5c610380cb1ecf3f39b52b22de672 100644 (file)
--- 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 8f483b989370df3b18aae0a92f9e12813334bc75..7e2b94f28eb7ecb015d03c888042597fc8efce55 100644 (file)
--- 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 abed775c5c3802217bc733518191f22965539983..9a12727dc5051011194c868cceb9d93623bd7040 100644 (file)
--- 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 a5b556e5ce29d45475606c9cfe72afca68296d2d..52ab59840e67987a83ea43240651724bc842bf4b 100644 (file)
--- 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 9e74b141a81591a813311a1b7e93c0fce7eee6b8..a35e1a2f5c73df5e2fab99a39b2fa51ee73d152a 100644 (file)
--- 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