openstack/puppet-openstack-integration
Code Issues Proposed changes

Drop unnecessary clean-ups for Puppet

Browse Source 
Nodepool images no longer have Puppet in them anymore so there
is no point in removing files and packages which are not there
anymore in the first place.

Change-Id: Idb89512251ca9125fcb3f44768873d2cb76eb879
This commit is contained in:
Mohammed Naser 2017-10-09 14:21:42 -04:00 committed by Tobias Urdin
parent 46ca2319b1
commit f416da3a9a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions
View File

@ -126,22 +126,12 @@ install_puppet() {
print_header 'Setup (Debian based)'
# Puppetlabs packaging:
# - xenial: puppet4 only
if dpkg -l $PUPPET_RELEASE_FILE >/dev/null 2>&1; then
$SUDO apt-get purge -y $PUPPET_RELEASE_FILE
fi
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} `lsb_release -s -c` PC1" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list
$SUDO apt-key add files/GPG-KEY-puppetlabs
# TODO(emilien): figure what installed /etc/default/puppet on the xenial nodepool image
# We have no problem on Trusty but on Xenial we need to remove /etc/default/puppet before
# trying to deploy puppet-agent from puppetlabs.com.
$SUDO rm -rf /etc/default/puppet
$SUDO apt-get update
$SUDO apt-get install -y ${PUPPET_PKG}
elif is_fedora; then
print_header 'Setup (RedHat based)'
if rpm --quiet -q $PUPPET_RELEASE_FILE; then
$SUDO rpm -e $PUPPET_RELEASE_FILE
fi
# EPEL does not work fine with RDO, we need to make sure EPEL is really disabled
if rpm --quiet -q epel-release; then
$SUDO rpm -e epel-release