openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Dont hardcode CentOS version for Ceph repos 

Change-Id: Iafd57e7a27ed41a445f48d9e07086d0c153d6758
This commit is contained in:
Tobias Urdin 2020-05-14 19:46:15 +02:00
parent a13a53f811
commit fe17c6632c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure_facts.sh
View File

@ -42,9 +42,9 @@ if [ -f /etc/ci/mirror_info.sh ]; then
else
# NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.
if [ "$CEPH_VERSION" == "mimic" ]; then
CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/'
CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/"
else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
fi
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
fi
@ -59,9 +59,9 @@ else
else
# NOTE(tobias-urdin): Mimic was never released by Storage SIG to official mirros.
if [ "$CEPH_VERSION" == "mimic" ]; then
CEPH_MIRROR_HOST='https://trunk.rdoproject.org/centos7/deps/storage/storage7-ceph-mimic/x86_64/'
CEPH_MIRROR_HOST="https://trunk.rdoproject.org/centos${REDHAT_SUPPORT_PRODUCT_VERSION}/deps/storage/storage${REDHAT_SUPPORT_PRODUCT_VERSION}-ceph-mimic/x86_64/"
else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-${CEPH_VERSION}/"
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${REDHAT_SUPPORT_PRODUCT_VERSION}/storage/x86_64/ceph-${CEPH_VERSION}/"
fi
NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
fi