Commit 3f5b8efd authored by Fabien Combernous's avatar Fabien Combernous

Merge branch '36-pin-beaker-vagrant-to-version-0-5-0' into 'master'

Resolve "pin beaker-vagrant to version 0.5.0"

Closes #36

See merge request adullact/puppet-freeipa!39
parents 5c5de5fe 1b4cbee2
...@@ -25,6 +25,7 @@ Gemfile: ...@@ -25,6 +25,7 @@ Gemfile:
- gem: 'rspec' - gem: 'rspec'
- gem: 'rake' - gem: 'rake'
- gem: 'beaker-vagrant' - gem: 'beaker-vagrant'
version: '0.5.0'
- gem: 'net-telnet' - gem: 'net-telnet'
gem: 'net-telnet' gem: 'net-telnet'
condition: "Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')" condition: "Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')"
......
...@@ -47,7 +47,7 @@ group :development do ...@@ -47,7 +47,7 @@ group :development do
gem "puppet-lint", require: false gem "puppet-lint", require: false
gem "rspec", require: false gem "rspec", require: false
gem "rake", require: false gem "rake", require: false
gem "beaker-vagrant", require: false gem "beaker-vagrant", '0.5.0', require: false
gem "net-telnet", '< 0.2.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') gem "net-telnet", '< 0.2.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
gem "rubocop", '< 0.58.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') gem "rubocop", '< 0.58.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
gem "net-telnet", '>= 0.2.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4') gem "net-telnet", '>= 0.2.0', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
......
...@@ -11,6 +11,7 @@ HOSTS: ...@@ -11,6 +11,7 @@ HOSTS:
box_version: 1809.01 box_version: 1809.01
box_check_update: false box_check_update: false
vagrant_memsize: 4048 vagrant_memsize: 4048
vagrant_cpus: 4
ip: 192.168.44.35 ip: 192.168.44.35
ipa-server-2: ipa-server-2:
roles: roles:
...@@ -22,6 +23,7 @@ HOSTS: ...@@ -22,6 +23,7 @@ HOSTS:
box_version: 1809.01 box_version: 1809.01
box_check_update: false box_check_update: false
vagrant_memsize: 4048 vagrant_memsize: 4048
vagrant_cpus: 2
ip: 192.168.44.36 ip: 192.168.44.36
ipa-client-centos: ipa-client-centos:
roles: roles:
......
require 'puppetlabs_spec_helper/module_spec_helper' require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts' require 'rspec-puppet-facts'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment