Use Puppet 4 in Beaker tests

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

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index f80a0e422590d2a6db44f1cd50c9b81a890fc369..9abd6e58b77d0f72c4937d2f8e9457b09a0e7fe7 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,13 +5,7 @@ require 'beaker-rspec/helpers/serverspec'
 unless ENV['BEAKER_provision'] == 'no'
   hosts.each do |host|
     # Install Puppet
-    if host.is_pe?
-      install_pe
-    elsif host.name == "ubuntu-16-docker" || host.name == "ubuntu-16"
-      install_puppet_agent_on(host, puppet_collection: "pc1")
-    else
-      install_puppet
-    end
+    install_puppet_agent_on(host, puppet_collection: "pc1")
   end
 end