openstack/puppet-openstack-integration
Code Issues Proposed changes

Restore FACTER_ environments

Browse Source 
We removed these environments by the recent refactoring[1] but these
were actually needed to inject the required mirror facts.

This also fixes the handling of UCA mirror.

[1] 8f2bced9a002ac4052faa2254be0b4228c5a2a6a

Change-Id: Ib9ed229f9224498769aa47f997af60d48ae01943
This commit is contained in:
Takashi Kajinami 2023-10-15 00:55:10 +09:00
parent c8c85b1222
commit 9aa976c7d3
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure_facts.sh
View File

@ -53,12 +53,20 @@ else
fi fi
fi fi
export FACTER_openstack_version=${OPENSTACK_VERSION}
export FACTER_ceph_mirror_host=${CEPH_MIRROR_HOST}
export FACTER_ceph_version=${CEPH_VERSION}
COMMON_MIRROR_FACTS="\
openstack_version=${FACTER_openstack_version}
ceph_mirror_host=${FACTER_ceph_mirror_host}
ceph_version=${FACTER_ceph_version}"
if uses_debs; then if uses_debs; then
export FACTER_uca_mirror_host=${NODEPOOL_UCA_MIRROR}
MIRROR_FACTS="\ MIRROR_FACTS="\
openstack_version=${OPENSTACK_VERSION} uca_mirror_host=${FACTER_uca_mirror_host}"
uca_mirror_host=${UCA_MIRROR_HOST}
ceph_mirror_host=${CEPH_MIRROR_HOST}
ceph_version=${CEPH_VERSION}"
else else
curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/${DLRN_BASE_URL}" curl -o /tmp/delorean.repo "${NODEPOOL_RDO_PROXY}/${DLRN_BASE_URL}"
sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean.repo sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean.repo
@ -68,16 +76,18 @@ else
sed -i -e "s|http://mirror.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo sed -i -e "s|http://mirror.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo
sed -i -e "s|http://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo sed -i -e "s|http://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo
export FACTER_centos_mirror_host=${CENTOS_MIRROR_HOST}
export FACTER_delorean_repo_path=/tmp/delorean.repo
export FACTER_delorean_deps_repo_path=/tmp/delorean-deps.repo
MIRROR_FACTS="\ MIRROR_FACTS="\
openstack_version=${OPENSTACK_VERSION} centos_mirror_host=${FACTER_centos_mirror_host}
centos_mirror_host=${CENTOS_MIRROR_HOST} delorean_repo_path=${FACTER_delorean_repo_path}
ceph_mirror_host=${CEPH_MIRROR_HOST} delorean_deps_repo_path=${FACTER_delorean_deps_repo_path}"
ceph_version=${CEPH_VERSION}
delorean_repo_path=/tmp/delorean.repo
delorean_deps_repo_path=/tmp/delorean-deps.repo"
fi fi
if [ "${WRITE_FACTS}" = true ]; then if [ "${WRITE_FACTS}" = true ]; then
$SUDO mkdir -p /etc/facter/facts.d/ $SUDO mkdir -p /etc/facter/facts.d/
echo "$MIRROR_FACTS" | $SUDO tee /etc/facter/facts.d/mirrors.txt echo "$COMMON_MIRROR_FACTS" | $SUDO tee /etc/facter/facts.d/mirrors.txt
echo "$MIRROR_FACTS" | $SUDO tee -a /etc/facter/facts.d/mirrors.txt
fi fi