openstack/puppet-openstack-integration
Code Issues Proposed changes

Use rdo mirror for CentOS integration tests

Browse Source 
Conflicts:
	manifests/repos.pp

Backport note:
The branch is updated from master to the corresponding stable branch
during backport.

Change-Id: I6b3c9fd006d9dad71ceb2ea6c84596369afe9c0a
(cherry picked from commit 13701274f1)
This commit is contained in:
Takashi Kajinami
2020-10-29 01:09:34 +09:00
parent 8c112583c3
commit a154f48943
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure_facts.sh
View File

@@ -71,12 +71,19 @@ else
fi
fi
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/centos8-victoria/puppet-passed-ci/delorean.repo"
sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean.repo
curl -o /tmp/delorean-deps.repo "${NODEPOOL_RDO_PROXY}/centos8-victoria/delorean-deps.repo"
sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean-deps.repo
export FACTER_nodepool_mirror_host=$NODEPOOL_MIRROR_HOST
export FACTER_centos_mirror_host=$CENTOS_MIRROR_HOST
export FACTER_uca_mirror_host=$NODEPOOL_UCA_MIRROR
export FACTER_deps_mirror_host=$DEPS_MIRROR_HOST
export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
export FACTER_ceph_version=$CEPH_VERSION
export FACTER_delorean_repo_path="/tmp/delorean.repo"
export FACTER_delorean_deps_repo_path="/tmp/delorean-deps.repo"
MIRROR_FACTS="\
nodepool_mirror_host=${FACTER_nodepool_mirror_host}
@@ -84,7 +91,9 @@ centos_mirror_host=${FACTER_centos_mirror_host}
uca_mirror_host=${FACTER_uca_mirror_host}
deps_mirror_host=${FACTER_deps_mirror_host}
ceph_mirror_host=${FACTER_ceph_mirror_host}
ceph_version=${FACTER_ceph_version}"
ceph_version=${FACTER_ceph_version}
delorean_repo_path=${FACTER_delorean_repo_path}
delorean_deps_repo_path=${FACTER_delorean_deps_repo_path}"
if [ "${WRITE_FACTS}" = true ]; then
$SUDO mkdir -p /etc/facter/facts.d/

17
manifests/repos.pp
View File

@@ -52,13 +52,26 @@ class openstack_integration::repos {
} else {
$centos_mirror = 'http://mirror.centos.org'
}
if defined('$::delorean_repo_path') and $::delorean_repo_path != '' {
$delorean_repo = $::delorean_repo_path
} else {
$delorean_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/puppet-passed-ci/delorean.repo"
}
if defined('$::delorean_deps_repo_path') and $::delorean_deps_repo_path != '' {
$delorean_deps_repo = $::delorean_deps_repo_path
} else {
$delorean_deps_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/puppet-passed-ci/delorean.repo"
}
class { 'openstack_extras::repo::redhat::redhat':
manage_rdo => false,
manage_epel => false,
centos_mirror_url => $centos_mirror,
repo_source_hash => {
'delorean.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/puppet-passed-ci/delorean.repo",
'delorean-deps.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/delorean-deps.repo"
'delorean.repo' => $delorean_repo,
'delorean-deps.repo' => $delorean_deps_repo
},
repo_replace => false,
update_packages => true,