From 918f49b08566828f49e862e212b25f86e7cdc4c8 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 9 Sep 2016 07:50:23 -0400
Subject: [PATCH] Unpin Puppetlabs release package

Puppetlabs release package was fixed so we can unpin it in our CI.

Change-Id: Ie18ff211b919b8ae4bc5a6d28ab8afe948991ed4
---
 functions | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/functions b/functions
index 8b09e8dd4..a6cc03c89 100644
--- a/functions
+++ b/functions
@@ -168,14 +168,7 @@ install_puppet() {
         fi
         $SUDO rm -f /tmp/puppet.rpm
 
-        # https://tickets.puppetlabs.com/browse/CPR-378
-        if [ $PUPPET_RELEASE_FILE == "puppetlabs-release" ]; then
-            RELEASE_URL='http://yum.puppetlabs.com/el/7Server/products/x86_64/puppetlabs-release-7-12.noarch.rpm'
-        else
-            RELEASE_URL='https://yum.puppetlabs.com/el/7Server/PC1/x86_64/puppetlabs-release-pc1-1.0.0-2.el7.noarch.rpm'
-        fi
-
-        wget  $RELEASE_URL -O /tmp/puppet.rpm
+        wget http://yum.puppetlabs.com/${PUPPET_RELEASE_FILE}-el-7.noarch.rpm -O /tmp/puppet.rpm
         $SUDO rpm -ivh /tmp/puppet.rpm
         $SUDO yum install -y ${PUPPET_PKG}
     fi