Merge pull request redhat-openstack#100 from mhaskel/1.1.0-prep

1.1.0 prep

Author: Ashley Penney

metadata.json

@@ -86,7 +86,7 @@
       }
     ],
     "requirements": [
-      { "name": "pe", "version_requirement": "3.3.x" },
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
       { "name": "puppet", "version_requirement": "3.x" }
     ],
     "dependencies": []

spec/spec_helper_acceptance.rb

@@ -2,16 +2,14 @@
 require 'beaker-rspec/helpers/serverspec'
 
 unless ENV['RS_PROVISION'] == 'no'
+  if hosts.first.is_pe?
+    install_pe
+  else
+    install_puppet
+  end
   hosts.each do |host|
     if host['platform'] =~ /debian/
       on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-    end
-    if host.is_pe?
-      install_pe
-    else
-      # Install Puppet
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
       on host, "mkdir -p #{host['distmoduledir']}"
     end
   end