From a13001fc36b9db0ee00d58eac8b0b07bae0f84a8 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 3 Feb 2021 21:33:03 +0900
Subject: [PATCH] Switch to Ceph Octopus from Nautilus

EOL of Nautilus is coming soon (2021-06-01) so let's switch to newer
version now.

Change-Id: Idd9e509e49827ce490819df762108afd50585153
---
 configure_facts.sh      | 2 +-
 functions               | 2 +-
 manifests/repos.pp      | 2 +-
 run_tests.sh            | 2 +-
 zuul.d/base.yaml        | 2 +-
 zuul.d/integration.yaml | 4 ++--
 zuul.d/litmus.yaml      | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure_facts.sh b/configure_facts.sh
index 393252bf4..3837c051d 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:-nautilus}
+export CEPH_VERSION=${CEPH_VERSION:-octopus}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions
diff --git a/functions b/functions
index 7eecd2b71..e1d9c3327 100644
--- a/functions
+++ b/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"
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 5d1f78bf4..981d73537 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 = 'nautilus'
+    $ceph_version_real = 'octopus'
   }
   case $::osfamily {
     'Debian': {
diff --git a/run_tests.sh b/run_tests.sh
index d97685163..9e32333f8 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:-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}
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 0630837a9..7d2b1474b 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -77,7 +77,7 @@
     roles:
       - zuul: zuul/zuul-jobs
     vars:
-      ceph: nautilus
+      ceph: octopus
 
 - job:
     name: puppet-openstack-base
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index dd7e86b98..ad006fe4d 100644
--- a/zuul.d/integration.yaml
+++ b/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
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index eff4f96f7..cd2103646 100644
--- a/zuul.d/litmus.yaml
+++ b/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