openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove Puppet 4 repo fixes"

Browse Source
This commit is contained in:
Zuul 2020-05-18 07:10:45 +00:00 committed by Gerrit Code Review
commit 31b1026b56
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
functions
View File

@ -168,17 +168,12 @@ install_puppet() {
if uses_debs; then if uses_debs; then
print_header 'Setup (Debian based)' print_header 'Setup (Debian based)'
if [ "${MANAGE_REPOS}" == "true" ] ; then if [ "${MANAGE_REPOS}" == "true" ] ; then
if [ $PUPPET_MAJ_VERSION == 4 ]; then
local PUPPET_APT_POOL="PC1"
else
local PUPPET_APT_POOL="puppet${PUPPET_MAJ_VERSION}"
fi
PUPPET_CODENAME=$(lsb_release -s -c) PUPPET_CODENAME=$(lsb_release -s -c)
if [ $PUPPET_CODENAME == "bionic" ]; then if [ $PUPPET_CODENAME == "bionic" ]; then
# For some reason this directory does not exist in Bionic # For some reason this directory does not exist in Bionic
$SUDO mkdir -p /etc/apt/sources.list.d $SUDO mkdir -p /etc/apt/sources.list.d
fi fi
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} ${PUPPET_APT_POOL}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list
$SUDO apt-key add files/GPG-KEY-puppetlabs $SUDO apt-key add files/GPG-KEY-puppetlabs
$SUDO apt-key add files/GPG-KEY-ceph $SUDO apt-key add files/GPG-KEY-ceph
$SUDO apt-get update $SUDO apt-get update
@ -192,17 +187,13 @@ install_puppet() {
fi fi
if [ "${MANAGE_REPOS}" == "true" ] ; then if [ "${MANAGE_REPOS}" == "true" ] ; then
if [ $PUPPET_MAJ_VERSION == 4 ]; then source /etc/os-release
local PUPPET_YUM_SUFFIX="/el/7/PC1/x86_64/"
else
local PUPPET_YUM_SUFFIX="/puppet${PUPPET_MAJ_VERSION}/el/7/x86_64/"
fi
$SUDO rpm --import files/GPG-KEY-puppetlabs $SUDO rpm --import files/GPG-KEY-puppetlabs
$SUDO rpm --import files/GPG-KEY-puppet $SUDO rpm --import files/GPG-KEY-puppet
$SUDO bash -c "cat << EOF > /etc/yum.repos.d/puppetlabs.repo $SUDO bash -c "cat << EOF > /etc/yum.repos.d/puppetlabs.repo
[puppetlabs-products] [puppetlabs-products]
name=Puppet Labs Products El 7 - x86_64 name=Puppet Labs Products El ${REDHAT_SUPPORT_PRODUCT_VERSION} - x86_64
baseurl=${NODEPOOL_PUPPETLABS_MIRROR}${PUPPET_YUM_SUFFIX} baseurl=${NODEPOOL_PUPPETLABS_MIRROR}/puppet${PUPPET_MAJ_VERSION}/el/${REDHAT_SUPPORT_PRODUCT_VERSION}/x86_64/
gpgkey=file:///etc/pki/rpm-gpg/GPG-KEY-puppetlabs gpgkey=file:///etc/pki/rpm-gpg/GPG-KEY-puppetlabs
file:///etc/pki/rpm-gpg/GPG-KEY-puppet file:///etc/pki/rpm-gpg/GPG-KEY-puppet
enabled=1 enabled=1