Merge branch 'stable'

puppetlabs · Dec 31, 2015 · b4caa92 · b4caa92
2 parents 75e98dd + f258821
commit b4caa92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 2.27")
-gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 0.2")
+gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 0.3")
 gem 'rake', "~> 10.1.0"
 gem "multi_json", "~> 1.8"
 

diff --git a/acceptance/Rakefile b/acceptance/Rakefile
@@ -113,7 +113,7 @@ def beaker_test(mode = :aio, options = {})
   # conditional (and this comment) once that pipeline change is made.
   target = ENV['TEST_TARGET'] if ENV['TEST_TARGET'] && ENV['TEST_TARGET'][-1,1] == 'a'
   if target
-    cli = BeakerHostGenerator::CLI.new([target, '--disable-default-role'])
+    cli = BeakerHostGenerator::CLI.new([target, '--disable-default-role', '--osinfo-version', '1'])
     ENV['HOSTS'] = "tmp/#{target}-#{SecureRandom.uuid}.yaml"
     FileUtils.mkdir_p('tmp')
     File.open(hosts, 'w') do |fh|