openstack/puppet-openstack-integration
Code Issues Proposed changes

Switch to Ceph Pacific from Octopus

Browse Source 
As discussed in [1] we'll go along with Pacific with Xena
on CS8.

[1] https://review.rdoproject.org/r/c/rdo-infra/ansible-role-weirdo-puppet-openstack/+/35706

Change-Id: Iafbcd03b03adfb8597f5a7025dd84574a08b952f
This commit is contained in:
Joel Capitao 2021-09-27 10:06:03 +02:00
parent 0cba2c5d44
commit ceb720bd8c
7 changed files with 13 additions and 13 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_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:-octopus}
export CEPH_VERSION=${CEPH_VERSION:-pacific}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source $SCRIPT_DIR/functions

2
functions
View File

@ -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" ] || [ "$CEPH_VERSION" == "octopus" ]; then
if [ "$CEPH_VERSION" == "octopus" ] || [ "$CEPH_VERSION" == "pacific" ]; then
ZUUL_BRANCH="master"
else
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 != '' {
$ceph_version_real = $::ceph_version
} else {
$ceph_version_real = 'octopus'
$ceph_version_real = 'pacific'
}
case $::osfamily {
'Debian': {

2
run_tests.sh
View File

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

2
zuul.d/base.yaml
View File

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

8
zuul.d/integration.yaml
View File

@ -39,7 +39,7 @@
abstract: true
vars:
scenario: scenario001
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-integration-7-scenario001
@ -47,7 +47,7 @@
abstract: true
vars:
scenario: scenario001
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
@ -116,7 +116,7 @@
abstract: true
vars:
scenario: scenario004
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-integration-7-scenario004
@ -124,7 +124,7 @@
abstract: true
vars:
scenario: scenario004
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal

8
zuul.d/litmus.yaml
View File

@ -44,7 +44,7 @@
nodeset: centos-8-stream
vars:
puppet_gem_version: 7.8.0
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-litmus-6.21-ubuntu-focal
@ -53,7 +53,7 @@
voting: false
vars:
puppet_gem_version: 6.21.1
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-litmus-7.8-ubuntu-focal
@ -62,7 +62,7 @@
voting: false
vars:
puppet_gem_version: 7.8.0
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-litmus-latest-ubuntu-focal
@ -71,7 +71,7 @@
voting: false
vars:
puppet_gem_version: latest
ceph: octopus
ceph: pacific
- job:
name: puppet-openstack-libraries-litmus-7.8-centos-8-stream