From 4d6a35effa25b23e1f345402ca5ef34df74b7674 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 2 Feb 2022 17:21:22 +0900 Subject: [PATCH] Ceph: Use centos-8-stream instead of centos-8 Conflicts: configure_facts.sh Backport note: This backport includes part of f384effdb42e0cbe19e137f0411b09ac8fef5b48 which fixed the repository url used when mirror info is not available. Also, this adds a puppet-openstack_extras parameter to enforce usage of stream repo. Default was changed during Xena cycle by [1] but that is not present in stable/wallaby and older. [1] cf8b734766bbe75ac5ce23d7a4237b77c8200dd3 In addition, because Octopus is not currently available, this reverts the following commit to switch to Nautilus. ROD has been using Nautilus for their Wallaby release and it's known to work. a13001fc36b9db0ee00d58eac8b0b07bae0f84a8. "Switch to Ceph Octopus from Nautilus" Finally, Nautilus is not available in ceph mirror so we'll switch to the mirror repo currently RDO is hosting. Change-Id: I97995b6821a24b64edbc5b1e874ba67a0418f96a (cherry picked from commit b2fa6c0e7bb6d5e319cd820484c120d043f58ab2) (cherry picked from commit 8c00b663d38a0f71cc2d108ff799f7aaa0b8f9e0) --- configure_facts.sh | 15 +++++++++++---- functions | 2 +- manifests/repos.pp | 5 +++-- run_tests.sh | 2 +- zuul.d/base.yaml | 2 +- zuul.d/integration.yaml | 4 ++-- zuul.d/litmus.yaml | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/configure_facts.sh b/configure_facts.sh index 09dd74d39..921166f7c 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -22,7 +22,7 @@ export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-wallaby/puppet-passed-ci} export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-wallaby/deps/latest/} export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-wallaby/puppet-passed-ci/delorean.repo} export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-wallaby/delorean-deps.repo} -export CEPH_VERSION=${CEPH_VERSION:-octopus} +export CEPH_VERSION=${CEPH_VERSION:-nautilus} export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) source $SCRIPT_DIR/functions @@ -39,12 +39,15 @@ if [ -f /etc/ci/mirror_info.sh ]; then if uses_debs; then if [ "$CEPH_VERSION" == "mimic" ] || [ "CEPH_VERSION" == "luminous" ] ; then CEPH_MIRROR_HOST="http://download.ceph.com/debian-${CEPH_VERSION}" - else CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}" fi NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" else - CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}/storage/x86_64/ceph-${CEPH_VERSION}/" + if [ "$CEPH_VERSION" == "nautilus" ]; then + CEPH_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/centos${VERSION_ID}-master/deps/storage/${CEPH_VERSION}/" + else + CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/" + fi NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs" fi else @@ -56,7 +59,11 @@ else CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}" NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com' else - CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}/storage/x86_64/ceph-${CEPH_VERSION}/" + if [ "$CEPH_VERSION" == "nautilus" ]; then + CEPH_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/centos${VERSION_ID}-master/deps/storage/${CEPH_VERSION}/" + else + CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/" + fi NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com" fi fi diff --git a/functions b/functions index bbfb9a8f2..b5fc50393 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" == "nautilus" ]; then ZUUL_BRANCH="master" else ZUUL_BRANCH="stable/$CEPH_VERSION" diff --git a/manifests/repos.pp b/manifests/repos.pp index 487d072bb..c0f8b184c 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 = 'nautilus' } case $::osfamily { 'Debian': { @@ -75,8 +75,9 @@ class openstack_integration::repos { }, repo_replace => false, update_packages => true, + stream => true, } - $ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}/storage/x86_64/ceph-${ceph_version_real}/" + $ceph_mirror_fallback = "${centos_mirror}/centos/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/" if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' { $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) } else { diff --git a/run_tests.sh b/run_tests.sh index 71db2ed8a..e8784c85c 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:-nautilus} 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 c54d3f9b8..4eb5a1901 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -117,7 +117,7 @@ roles: - zuul: zuul/zuul-jobs vars: - ceph: octopus + ceph: nautilus - job: name: puppet-openstack-base diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index 9e9ae0ab0..61bebd013 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -12,7 +12,7 @@ abstract: true vars: scenario: scenario001 - ceph: octopus + ceph: nautilus - job: name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal @@ -67,7 +67,7 @@ abstract: true vars: scenario: scenario004 - ceph: octopus + ceph: nautilus - job: name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index cd2103646..eff4f96f7 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: octopus + ceph: nautilus - job: name: puppet-openstack-litmus-ubuntu-focal @@ -52,7 +52,7 @@ voting: false vars: puppet_gem_version: latest - ceph: octopus + ceph: nautilus - job: name: puppet-openstack-libraries-litmus-centos-8-stream