diff --git a/configure_facts.sh b/configure_facts.sh index 060a9480a..2a118eab9 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:-octopus} +export CEPH_VERSION=${CEPH_VERSION:-pacific} export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) source $SCRIPT_DIR/functions diff --git a/functions b/functions index a1c1e8340..bf3eb924a 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" ] || [ "$CEPH_VERSION" == "octopus" ]; then + if [ "$CEPH_VERSION" == "octopus" ] || [ "$CEPH_VERSION" == "pacific" ]; then ZUUL_BRANCH="master" else ZUUL_BRANCH="stable/$CEPH_VERSION" diff --git a/manifests/repos.pp b/manifests/repos.pp index 981d73537..2744ba02e 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 = 'octopus' + $ceph_version_real = 'pacific' } case $::osfamily { 'Debian': { diff --git a/run_tests.sh b/run_tests.sh index 84ca3cf14..b717bd9fa 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:-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} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 48782235e..26a9eb1b6 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -77,7 +77,7 @@ roles: - zuul: zuul/zuul-jobs vars: - ceph: octopus + ceph: pacific - job: name: puppet-openstack-base diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index 6bce4da42..79c437d29 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -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 diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 2ac9f45d8..c04a2c6ee 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -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