Merge "Unpin beaker-rspec"

redhat-openstack · Jun 9, 2015 · 430f4f4 · 430f4f4
2 parents 208cee7 + ff99138
commit 430f4f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'rspec-puppet', '~> 2.1.0', :require => false
-  gem 'minitest', '~> 4.7', :require => 'minitest/unit'
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'
@@ -17,7 +16,7 @@ group :development, :test do
   gem 'puppet-lint-variable_contains_upcase'
   gem 'puppet-lint-numericvariable'
 
-  gem 'beaker-rspec', '~> 2.2.4', :require => false
+  gem 'beaker-rspec', :require => false
   gem 'json'
   gem 'webmock'
 end

diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
@@ -7,3 +7,4 @@ HOSTS:
     ip: 127.0.0.1
 CONFIG:
   type: foss
+  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
@@ -7,3 +7,4 @@ HOSTS:
     ip: 127.0.0.1
 CONFIG:
   type: foss
+  set_env: false