diff --git a/configure_facts.sh b/configure_facts.sh index a254b22f8..2c50c6daa 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -35,9 +35,11 @@ if [ -f /etc/ci/mirror_info.sh ]; then CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}" NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" else - # TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG release it. + # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it. if [ "$CEPH_VERSION" == "mimic" ]; then CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/' + elif [ "$CEPH_VERSION" == "nautilus" ]; then + CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/' else CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" fi @@ -52,9 +54,11 @@ else CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}" NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com' else - # TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG releases it. + # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG releases it. if [ "$CEPH_VERSION" == "mimic" ]; then CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/' + elif [ "$CEPH_VERSION" == "nautilus" ]; then + CEPH_MIRROR_HOST='http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/' else CEPH_MIRROR_HOST="https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/" fi diff --git a/functions b/functions index 302f7e8c7..fbcfa1a0c 100644 --- a/functions +++ b/functions @@ -24,7 +24,7 @@ install_openstack() { ZUUL_BRANCH=${ZUUL_BRANCH:-master} if [ "$ZUUL_PROJECT" != "openstack/puppet-ceph" ] && [ -n "$CEPH_VERSION" ]; then - if [ "$CEPH_VERSION" == "mimic" ]; 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 9bb90e304..9a45058c5 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -65,10 +65,11 @@ class openstack_integration::repos { }, }, } - # TODO(tobasco): Remove this CBS candidate repo for Mimic when Storage SIG release it. + # TODO(tobasco): Remove this CBS candidate repo for Mimic and Nautilus when Storage SIG release it. $ceph_mirror_fallback = $ceph_version_real ? { - 'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/', - default => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/" + 'mimic' => 'http://cbs.centos.org/repos/storage7-ceph-mimic-candidate/x86_64/os/', + 'nautilus' => 'http://cbs.centos.org/repos/storage7-ceph-nautilus-candidate/x86_64/os/', + default => "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${ceph_version_real}/" } $ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) # On CentOS, deploy Ceph using SIG repository and get rid of EPEL.