openstack/puppet-openstack-integration
Code Issues Proposed changes

Switch to Ceph Octopus from Nautilus

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

Change-Id: Idd9e509e49827ce490819df762108afd50585153
This commit is contained in:
Takashi Kajinami 2021-02-03 21:33:03 +09:00
parent fe029254fd
commit a13001fc36
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure_facts.sh
View File

@ -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_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_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 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) export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source $SCRIPT_DIR/functions source $SCRIPT_DIR/functions

2
functions
View File

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

2
manifests/repos.pp
View File

@ -4,7 +4,7 @@ class openstack_integration::repos {
if defined('$::ceph_version') and $::ceph_version != '' { if defined('$::ceph_version') and $::ceph_version != '' {
$ceph_version_real = $::ceph_version $ceph_version_real = $::ceph_version
} else { } else {
$ceph_version_real = 'nautilus' $ceph_version_real = 'octopus'
} }
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {

2
run_tests.sh
View File

@ -17,7 +17,7 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source ${SCRIPT_DIR}/functions source ${SCRIPT_DIR}/functions
export WORKSPACE=${WORKSPACE:-/tmp} 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 PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
export SCENARIO=${SCENARIO:-scenario001} export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true} export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

2
zuul.d/base.yaml
View File

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

4
zuul.d/integration.yaml
View File

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

4
zuul.d/litmus.yaml
View File

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