openstack/puppet-openstack-integration
Code Issues Proposed changes

Unpin Puppetlabs release package

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

Change-Id: Ie18ff211b919b8ae4bc5a6d28ab8afe948991ed4
This commit is contained in:
Emilien Macchi 2016-09-09 07:50:23 -04:00
parent f3e54e73e4
commit 918f49b085
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
functions
View File

@ -168,14 +168,7 @@ install_puppet() {
fi fi
$SUDO rm -f /tmp/puppet.rpm $SUDO rm -f /tmp/puppet.rpm
# https://tickets.puppetlabs.com/browse/CPR-378 wget http://yum.puppetlabs.com/${PUPPET_RELEASE_FILE}-el-7.noarch.rpm -O /tmp/puppet.rpm
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
$SUDO rpm -ivh /tmp/puppet.rpm $SUDO rpm -ivh /tmp/puppet.rpm
$SUDO yum install -y ${PUPPET_PKG} $SUDO yum install -y ${PUPPET_PKG}
fi fi