openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Switch to RDO Yoga" into stable/yoga

Browse Source
This commit is contained in:
Zuul
2022-05-31 15:49:14 +00:00
committed by Gerrit Code Review
parent 7281c2b6ca c3dcd69663
commit 0bc8bafdcc
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure_facts.sh
View File

@@ -18,10 +18,10 @@ export 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}-yoga/puppet-passed-ci}
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-yoga/deps/latest/}
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-yoga/puppet-passed-ci/delorean.repo}
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-yoga/delorean-deps.repo}
export CEPH_VERSION=${CEPH_VERSION:-pacific}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
@@ -62,9 +62,9 @@ else
fi
fi
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo"
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/${OS_NAME_VERS}-yoga/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}/${OS_NAME_VERS}-master/delorean-deps.repo"
curl -o /tmp/delorean-deps.repo "${NODEPOOL_RDO_PROXY}/${OS_NAME_VERS}-yoga/delorean-deps.repo"
sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean-deps.repo
sed -i -e "s|http://mirror.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo

2
functions
View File

@@ -238,7 +238,7 @@ EOF"
$SUDO bash -c "cat << EOF > /etc/yum.repos.d/puppet-rdo.repo
[puppet-rdo]
name=Puppet from RDO repo for CentOS ${VERSION_ID} - x86_64
baseurl=https://trunk.rdoproject.org/centos9-master/deps/latest/
baseurl=https://trunk.rdoproject.org/centos9-yoga/deps/latest/
enabled=1
gpgcheck=0
EOF"

4
manifests/repos.pp
View File

@@ -64,13 +64,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']}-yoga/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']}-yoga/delorean-deps.repo"
}
class { 'openstack_extras::repo::redhat::redhat':