Change Puppet repo for Bionic

Puppet 5 for Bionic is now released and we don't need
to run the nightly puppet5 builds anymore.

Change-Id: If91bd851f3f67813cc44064be01290b9bd617cbb
This commit is contained in:
Tobias Urdin 2018-07-27 12:26:15 +02:00
parent 476c9b7fc2
commit 2daefe49a8
1 changed files with 0 additions and 3 deletions

View File

@ -146,12 +146,9 @@ install_puppet() {
local PUPPET_APT_POOL="puppet5"
fi
PUPPET_CODENAME=$(lsb_release -s -c)
# TODO(tobasco): Remove this when Puppet 5 is released for Bionic i.e not nightly build.
if [ $PUPPET_CODENAME == "bionic" ]; then
# For some reason this directory does not exist in Bionic
$SUDO mkdir -p /etc/apt/sources.list.d
NODEPOOL_PUPPETLABS_MIRROR="https://nightlies.puppet.com/apt"
PUPPET_APT_POOL="puppet5-nightly"
fi
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} ${PUPPET_APT_POOL}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list
$SUDO apt-key add files/GPG-KEY-puppetlabs