diff --git a/configure_facts.sh b/configure_facts.sh index 50b3efcd4..28972f649 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:-quincy} +export CEPH_VERSION=${CEPH_VERSION:-reef} export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) source $SCRIPT_DIR/functions diff --git a/manifests/repos.pp b/manifests/repos.pp index f9ebbf4b8..224925362 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -4,7 +4,7 @@ class openstack_integration::repos { if $facts['ceph_version'] and $facts['ceph_version'] != '' { $ceph_version_real = $facts['ceph_version'] } else { - $ceph_version_real = 'quincy' + $ceph_version_real = 'reef' } if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22') >= 0 { diff --git a/run_tests.sh b/run_tests.sh index 227442d47..34788fc1e 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:-quincy} +export CEPH_VERSION=${CEPH_VERSION:-reef} export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-6} 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 06e6739f0..351546e9c 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -77,7 +77,7 @@ roles: - zuul: zuul/zuul-jobs vars: - ceph: quincy + ceph: reef - job: name: puppet-openstack-base diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index e46d33a73..149713dd4 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -27,7 +27,7 @@ - ^setup.py$ - ^tox.ini$ vars: - ceph: quincy + ceph: reef - job: name: puppet-openstack-litmus-module-base