openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Fix installing puppet in Debian."

Browse Source
This commit is contained in:
Zuul 2021-04-13 10:05:28 +00:00 committed by Gerrit Code Review
commit 120d4070b4
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
all-in-one.sh
View File

@ -48,9 +48,13 @@ if is_fedora; then
DASHBOARD="dashboard" DASHBOARD="dashboard"
elif uses_debs; then elif uses_debs; then
print_header 'Setup (Debian based)' print_header 'Setup (Debian based)'
sudo apt-get remove -y --purge facter puppet puppet-common
sudo apt-get update sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev ruby wget lsb-release curl apt-transport-https adduser sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev ruby wget lsb-release curl apt-transport-https adduser
# Only purge puppet in Ubuntu, in Debian we use
# what the distribution provides.
if [ $(lsb_release --id -s) = "Ubuntu" ] ; then
sudo apt-get remove -y --purge facter puppet puppet-common
fi
DASHBOARD="horizon" DASHBOARD="horizon"
fi fi

10
functions
View File

@ -194,13 +194,23 @@ install_puppet() {
print_header 'Setup (Debian based)' print_header 'Setup (Debian based)'
if [ "${MANAGE_REPOS}" == "true" ] ; then if [ "${MANAGE_REPOS}" == "true" ] ; then
PUPPET_CODENAME=$(lsb_release -s -c) PUPPET_CODENAME=$(lsb_release -s -c)
DISTRIBUTION_VENDOR=$(lsb_release -s -i)
# In Debian, we use the distro packages
if [ "${DISTRIBUTION_VENDOR}" = "Ubuntu" ] ; then
$SUDO mkdir -p /etc/apt/sources.list.d $SUDO mkdir -p /etc/apt/sources.list.d
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $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
fi fi
fi
# In Debian, the distro package name is simply "puppet"
# and there's no reason to have it in a variable.
if [ "${DISTRIBUTION_VENDOR}" = "Debian" ] ; then
$SUDO apt-get install -y puppet
else
$SUDO apt-get install -y ${PUPPET_PKG} $SUDO apt-get install -y ${PUPPET_PKG}
fi
elif is_fedora; then elif is_fedora; then
print_header 'Setup (RedHat based)' print_header 'Setup (RedHat based)'
# EPEL does not work fine with RDO, we need to make sure EPEL is really disabled # EPEL does not work fine with RDO, we need to make sure EPEL is really disabled