repos: fix Ceph mirror when running outside p-o-i

Code Issues Proposed changes

When running outside p-o-i (ie: beaker jobs), we don't execute
run_tests.sh so we don't have the facts in place to configure mirrors.
This patch makes sure the ceph_mirror_fact is empty by default, and
overriden if used in p-o-i with run_tests.
Change-Id: I375adcc4d5e436c40bae8ede5ee2ff7ab3b25409

This commit is contained in:

Emilien Macchi

2016年07月20日 17:04:38 -04:00

parent 30276cee8a

commit b575899db2

2 changed files with 3 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/repos.pp

View File

@@ -55,17 +55,15 @@ class openstack_integration::repos {

if$::operatingsystem=='CentOS'{

$enable_sig = true

$enable_epel = false

$ceph_mirror = "${::ceph_mirror_host}/debian-jewel"

}else{

$enable_sig = false

$enable_epel = true

$ceph_mirror = "${::ceph_mirror_host}/ceph-deb-jewel"

}

class{ '::ceph::repo':

enable_sig => $enable_sig,

enable_epel => $enable_epel,

ceph_mirror => $ceph_mirror,

ceph_mirror => $::ceph_mirror_host,

}

4
run_tests.sh

View File

@@ -30,11 +30,11 @@ if [ -f /etc/nodepool/provider ]; then

NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')

CENTOS_MIRROR_HOST=${NODEPOOL_MIRROR_HOST}

UCA_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ubuntu-cloud-archive"

CEPH_MIRROR_HOST=${NODEPOOL_MIRROR_HOST}

CEPH_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ceph-deb-jewel"

else

CENTOS_MIRROR_HOST='mirror.centos.org'

UCA_MIRROR_HOST='ubuntu-cloud.archive.canonical.com/ubuntu'

CEPH_MIRROR_HOST='download.ceph.com'

CEPH_MIRROR_HOST='download.ceph.com/debian-jewel'

fi

export FACTER_centos_mirror_host="http://${CENTOS_MIRROR_HOST}"

export FACTER_uca_mirror_host="http://${UCA_MIRROR_HOST}"