From a7d7ddebada701aed8051087fdfc69bcecc154cf Mon Sep 17 00:00:00 2001
From: Gareth Rushgrove <gareth@morethanseven.net>
Date: Wed, 22 Jul 2015 15:52:46 +0100
Subject: [PATCH] Fix platform configuration for acceptance tests, update
 beaker

---
 Gemfile                                              | 3 +--
 spec/acceptance/nodesets/default.yml                 | 2 +-
 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml | 2 +-
 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml  | 2 +-
 spec/spec_helper_acceptance.rb                       | 9 +--------
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index e2aabd9b4..3c63fcea7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,12 +15,11 @@ end
 group :development do
   gem "travis"
   gem "travis-lint"
-  gem "beaker", "2.13.0"
+  gem "beaker", "~> 2.0"
   gem "beaker-puppet_install_helper", :require => false
   gem "beaker-rspec"
   gem "puppet-blacksmith"
   gem "guard-rake"
   gem "pry"
   gem "yard"
-  #gem "vagrant-wrapper"
 end
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 30c1bfbce..ec5ce8c74 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -2,7 +2,7 @@ HOSTS:
   ubuntu-server-1404-x64:
     roles:
       - master
-    platform: ubuntu-server-14.04-amd64
+    platform: ubuntu-14.04-amd64
     box: puppetlabs/ubuntu-14.04-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
     hypervisor: vagrant
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
index e4c7b9c27..23890413f 100644
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -2,7 +2,7 @@ HOSTS:
   ubuntu-server-12042-x64:
     roles:
       - master
-    platform: ubuntu-server-12.04-amd64
+    platform: ubuntu-12.04-amd64
     box: ubuntu-server-12042-x64-vbox4210-nocm
     box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
     hypervisor: vagrant
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
index 2fcee43a9..22290e65b 100644
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -2,7 +2,7 @@ HOSTS:
   ubuntu-server-1404-x64:
     roles:
       - master
-    platform: ubuntu-server-14.04-amd64
+    platform: ubuntu-14.04-amd64
     box: puppetlabs/ubuntu-14.04-64-nocm
     box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
     hypervisor: vagrant
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 13e560126..2aea5622f 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,14 +3,7 @@
 require 'pry'
 require 'beaker/puppet_install_helper'
 
-# this is a workaround for BKR-419. Beaker currently fails to
-# install puppet on Ubuntu 14.04 after version 2.13.0. But
-# install_puppet_on is used by puppet_install_helper
-def install_puppet_on(hosts, opts = {})
-  install_puppet(opts)
-end unless respond_to? :install_puppet_on
-
-run_puppet_install_helper
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # Project root