common: v18/reef kickoff

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

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b67a73bdfaf33b6e85e5bf051e65c4697d80be32..4b63ad5c6c2e46137cb27437bf6d27656e6e725a 100644 (file)
--- 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 8f204ccd391c0ab7e283122c4dc14370ff5c6812..67eee22a44167ee478c0c35690eac682fa6cb97d 100644 (file)
--- 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 b9feaac7a40384a2013430feededa7acf4d4a383..c58e177d9ed117b04f89879b821d170b14c0303a 100644 (file)
--- 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 7b4808e38ac8e7e2f904d409db5ccc6051fbbf93..fbe1d7aa185ee8c6fe607fe40dc23a681ba0b007 100644 (file)
--- 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 7b4808e38ac8e7e2f904d409db5ccc6051fbbf93..fbe1d7aa185ee8c6fe607fe40dc23a681ba0b007 100644 (file)
--- 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 854f761e734ab2e2ab21f7ffd225da4f0474e1d7..c4b401562dfa84e3f92e8ecb1aacbb3b42411c9a 100644 (file)
--- 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 e7d5663167ffedc1fdb977d198e09f4fe736b6f5..89d74ffa925fe472b293ba57f2b9120f067b3c0e 100644 (file)
--- 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 42e37ca1df59f560e99d10f68e87f97eb52132ae..70e2345dbceb3b5c27c746f7640d650616fd0a8e 100644 (file)
--- 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 a5af975debde6453c1dd9310c2c455509db38174..8c29eeed1f092f3576114f343ebe13d5d601f371 100644 (file)
--- 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 f146f9288a1a54a53cd8ce25b405d737d94c8b7f..17dffea109a92451caccf2f70277bd8e6edab1c0 100644 (file)
--- 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 cb39b140f841ca6ede7f6ffd652824e4bee17d96..77771026c803f60cf09072219733dd4b464679c6 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=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