Merge "Switch to Ceph Octopus from Nautilus"

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:-nautilus}
+export CEPH_VERSION=${CEPH_VERSION:-octopus}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions

functions

@@ -50,7 +50,7 @@ install_openstack() {
   ZUUL_BRANCH=${ZUUL_BRANCH:-master}
 
   if [ "$ZUUL_PROJECT" != "openstack/puppet-ceph" ] && [ -n "$CEPH_VERSION" ]; then
-    if [ "$CEPH_VERSION" == "nautilus" ]; then
+    if [ "$CEPH_VERSION" == "nautilus" ] || [ "$CEPH_VERSION" == "octopus" ]; then
       ZUUL_BRANCH="master"
     else
       ZUUL_BRANCH="stable/$CEPH_VERSION"

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 = 'nautilus'
+    $ceph_version_real = 'octopus'
   }
   case $::osfamily {
     'Debian': {

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:-nautilus}
+export CEPH_VERSION=${CEPH_VERSION:-octopus}
 export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
 export SCENARIO=${SCENARIO:-scenario001}
 export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

zuul.d/base.yaml

@@ -77,7 +77,7 @@
     roles:
       - zuul: zuul/zuul-jobs
     vars:
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-base

zuul.d/integration.yaml

@@ -12,7 +12,7 @@
     abstract: true
     vars:
       scenario: scenario001
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
@@ -88,7 +88,7 @@
     abstract: true
     vars:
       scenario: scenario004
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal

zuul.d/litmus.yaml

@@ -43,7 +43,7 @@
     nodeset: centos-8-stream
     vars:
       puppet_gem_version: 6.21.1
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-litmus-ubuntu-focal
@@ -52,7 +52,7 @@
     voting: false
     vars:
       puppet_gem_version: latest
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-libraries-litmus-centos-8-stream