openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Ubuntu: Use debian-<release> ceph repo 

According to the Ceph documentation[1] we should use the debian-* repo
for ubuntu and the ceph-deb-* repo no longer exists.

[1] https://docs.ceph.com/en/latest/install/get-packages/#ceph-release-packages

Change-Id: I7de0394eec856fc6d242f7b4872694324fdd12b7
This commit is contained in:
Takashi Kajinami 2021-10-27 22:17:35 +09:00
parent 60c26af3a4
commit 13044d9f9e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure_facts.sh
View File

@ -37,11 +37,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
DEPS_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_BASE}/"
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
CEPH_MIRROR_HOST="http://download.ceph.com/debian-${CEPH_VERSION}"
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}/"