Fix Puppet install in OVSDB Vagrantfile

The Vagrantfile's initial shell provisioner call attempted to
install Puppet via an old method that now fails. The repos
for installing Puppet on Ubuntu seem to have changed.

http://pastebin.com/6A4eBzM2

Puppet is now included in the default repos, so a simple apt-get
install works as expected.

Change-Id: Id5bb8e4d9d966ac69397fc7ab877bc5495e2dce5
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/resources/puppet/scripts/bootstrap.sh b/resources/puppet/scripts/bootstrap.sh
index 49f285c8d7d04bdefb57d76055a59996bd1a870d..4cc1a0bf46625f842ed3452a2b0e064a009b4d52 100644 (file)
--- a/resources/puppet/scripts/bootstrap.sh
+++ b/resources/puppet/scripts/bootstrap.sh
@@ -7,9 +7,6 @@ set -e
 # Load up the release information
 . /etc/lsb-release
 
-#REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release-${DISTRIB_CODENAME}.deb"
-REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release-stable.deb"
-
 #--------------------------------------------------------------------
 # NO TUNABLES BELOW THIS POINT
 #--------------------------------------------------------------------
@@ -31,18 +28,9 @@ apt-get update >/dev/null
 echo "Installing wget..."
 apt-get install -y wget >/dev/null
 
-# Install the PuppetLabs repo
-echo "Configuring PuppetLabs repo..."
-repo_deb_path=$(mktemp)
-wget --output-document="${repo_deb_path}" "${REPO_DEB_URL}" 2>/dev/null
-dpkg -i "${repo_deb_path}" >/dev/null
-apt-get update >/dev/null
-
 # Install Puppet
 echo "Installing Puppet..."
-DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install puppet >/dev/null
-
-echo "Puppet installed!"
+apt-get install -y puppet >/dev/null
 
 # Install RubyGems for the provider
 echo "Installing RubyGems..."