From f416da3a9a98b16e9563846fedc4b8e215749c68 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Mon, 9 Oct 2017 14:21:42 -0400
Subject: [PATCH] Drop unnecessary clean-ups for Puppet

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
---
 functions | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/functions b/functions
index c19a19cd0..bc18f8e8a 100644
--- a/functions
+++ b/functions
@@ -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