Update with msync

diff --git a/Gemfile b/Gemfile
index c7aa4a51c6295d94d52a4921b39850e8817a047d..f4364ea111bb56e15fda8c27f2316e05a526bc1d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
   gem 'rake',                                              :require => false
-  gem 'rspec-puppet', '~> 2.0',                            :require => false
+  gem 'rspec-puppet',                                      :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3'
   gem 'puppetlabs_spec_helper',                            :require => false, :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper', :branch => 'master'
   gem 'puppet-lint',                                       :require => false
   gem 'puppet-lint-unquoted_string-check',                 :require => false
@@ -15,15 +15,11 @@ group :development, :unit_tests do
   gem 'puppet-lint-trailing_comma-check',                  :require => false
   gem 'puppet-lint-file_ensure-check',                     :require => false
   gem 'puppet-lint-version_comparison-check',              :require => false
-  gem 'simplecov',                                         :require => false
   gem 'rspec-puppet-facts',                                :require => false
-  gem 'json',                                              :require => false
-  gem 'metadata-json-lint',                                :require => false
-  gem 'docker-api', '1.15.0',                              :require => false
 end
 
 group :system_tests do
-  gem 'beaker',        :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack'
+  gem 'beaker',        :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack'
   gem 'beaker-rspec',  :require => false
   gem 'serverspec',    :require => false
 end

diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index a9c461bad630ebf550a025d0a5c1cffe797eef0b..6f02769089f34e08450fb5a682bb1c9e808cb39c 100644 (file)
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
       strict_variables:
     platform: el-7-x86_64
     hypervisor : vagrant
-    box : puppetlabs/centos-6.5-64-nocm
+    box : camptocamp/centos-7-x86_64
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
new file mode 100644 (file)
index 0000000..71e8194
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  debian-6-x64:
+    default_apply_opts:
+      strict_variables:
+    platform: debian-6-amd64
+    hypervisor : vagrant
+    box : puppetlabs/debian-6.0.9-64-nocm
+CONFIG:
+  type: foss
+  log_level: debug