From 00d2805a446bd2e94d404a8658a476695058fc54 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Fri, 19 Aug 2022 12:06:07 +0200
Subject: [PATCH] Switch to Ceph Quincy from Pacific

Change-Id: I1fd10e3a25d26f69ffb386661446d5629af925f3
---
 configure_facts.sh      |  2 +-
 manifests/ceph.pp       |  5 +++++
 manifests/repos.pp      |  2 +-
 run_tests.sh            |  2 +-
 zuul.d/base.yaml        |  2 +-
 zuul.d/integration.yaml | 12 ++++++------
 zuul.d/litmus.yaml      |  8 ++++----
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/configure_facts.sh b/configure_facts.sh
index a0095bc40..0b038f616 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -22,7 +22,7 @@ export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci}
 export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
 export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
 export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
-export CEPH_VERSION=${CEPH_VERSION:-pacific}
+export CEPH_VERSION=${CEPH_VERSION:-quincy}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions
diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index 8d5362136..45e8c7145 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -43,6 +43,11 @@ test -b /dev/ceph_vg/lv_data
 
   Exec['lvm_create'] -> Class['Ceph::Osds']
 
+  class { 'ceph::params':
+    # Since Quincy, the ceph-volume command is provided by the separate package
+    packages => ['ceph', 'ceph-volume']
+  }
+
   class { 'ceph::profile::params':
     fsid                         => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
     manage_repo                  => false, # repo already managed in openstack_integration::repo
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 9be7cb105..70545cfe8 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -4,7 +4,7 @@ class openstack_integration::repos {
   if defined('$::ceph_version') and $::ceph_version != '' {
     $ceph_version_real = $::ceph_version
   } else {
-    $ceph_version_real = 'pacific'
+    $ceph_version_real = 'quincy'
   }
   case $::osfamily {
     'Debian': {
diff --git a/run_tests.sh b/run_tests.sh
index 594b1312d..2c39dc9ee 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -17,7 +17,7 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source ${SCRIPT_DIR}/functions
 
 export WORKSPACE=${WORKSPACE:-/tmp}
-export CEPH_VERSION=${CEPH_VERSION:-pacific}
+export CEPH_VERSION=${CEPH_VERSION:-quincy}
 export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-6}
 export SCENARIO=${SCENARIO:-scenario001}
 export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 4f30a06bf..b5b2ec436 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -77,7 +77,7 @@
     roles:
       - zuul: zuul/zuul-jobs
     vars:
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-base
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 8423e457d..cf33aef74 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -41,7 +41,7 @@
     abstract: true
     vars:
       scenario: scenario001
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-7-scenario001
@@ -49,7 +49,7 @@
     abstract: true
     vars:
       scenario: scenario001
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
@@ -127,7 +127,7 @@
     abstract: true
     vars:
       scenario: scenario004
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-7-scenario004
@@ -135,7 +135,7 @@
     abstract: true
     vars:
       scenario: scenario004
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
@@ -157,7 +157,7 @@
     abstract: true
     vars:
       scenario: scenario005
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-7-scenario005
@@ -165,7 +165,7 @@
     abstract: true
     vars:
       scenario: scenario005
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-6-scenario005-tempest-ubuntu-focal
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index d5f916ac2..7f29bdd3b 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -44,7 +44,7 @@
     nodeset: centos-9-stream
     vars:
       puppet_gem_version: 7.16.0
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-litmus-6.28-ubuntu-focal
@@ -53,7 +53,7 @@
     voting: false
     vars:
       puppet_gem_version: 6.28.0
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-litmus-7.16-ubuntu-focal
@@ -62,7 +62,7 @@
     voting: false
     vars:
       puppet_gem_version: 7.16.0
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-litmus-latest-ubuntu-focal
@@ -71,7 +71,7 @@
     voting: false
     vars:
       puppet_gem_version: latest
-      ceph: pacific
+      ceph: quincy
 
 - job:
     name: puppet-openstack-libraries-litmus-7.16-centos-9-stream