openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Switch to RDO Wallaby"

This commit is contained in:
Zuul 2021-04-06 17:48:49 +00:00 committed by Gerrit Code Review
parent 26bddbb097 993a26d0a6
commit f6b75a4f40
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure_facts.sh
View File

@ -18,10 +18,10 @@ OS_NAME_VERS=${ID}${VERSION_ID}
# Write out facts to the facter folder when we generate them.
export WRITE_FACTS=${WRITE_FACTS:-true}
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci}
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-wallaby/puppet-passed-ci}
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-wallaby/deps/latest/}
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-wallaby/puppet-passed-ci/delorean.repo}
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-wallaby/delorean-deps.repo}
export CEPH_VERSION=${CEPH_VERSION:-octopus}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
@ -61,9 +61,9 @@ else
fi
fi
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/centos8-master/puppet-passed-ci/delorean.repo"
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/centos8-wallaby/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-master/delorean-deps.repo"
curl -o /tmp/delorean-deps.repo "${NODEPOOL_RDO_PROXY}/centos8-wallaby/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

4
manifests/repos.pp
View File

@ -56,13 +56,13 @@ class openstack_integration::repos {
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']}-master/puppet-passed-ci/delorean.repo"
$delorean_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-wallaby/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']}-master/delorean-deps.repo"
$delorean_deps_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-wallaby/delorean-deps.repo"
}
class { 'openstack_extras::repo::redhat::redhat':