From c9cd0c5094b64fb2d4e76899eaccad9ba4033534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 24 Mar 2015 10:06:18 +0100 Subject: Update with msync --- Gemfile | 2 +- spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 3 +-- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 10 ++++++++++ spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 10 ++++++++++ 9 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml diff --git a/Gemfile b/Gemfile index a3a9eca..2cbe160 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false gem 'rspec', '~> 3.1.0', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' + gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false gem 'puppet-lint', :require => false diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 37dfc5f..2036c0b 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: centos-7-x86_64-genericcloud-20140929_01 user: centos CONFIG: diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index 6f02769..fe0f83b 100644 --- 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 : camptocamp/centos-7-x86_64 + box : puppetlabs/centos-7.0-64-nocm 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 index 71e8194..23dae1b 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-6-amd64 hypervisor : vagrant - box : puppetlabs/debian-6.0.9-64-nocm + box : puppetlabs/debian-6.0.10-64-nocm CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index e52336b..c44f917 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-7-amd64-20141121 user: debian CONFIG: diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 97099de..86c2165 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -4,8 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : vagrant - box : debian-73-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box + box : puppetlabs/debian-7.8-64-nocm CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 194ca46..f7b2e50 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -4,10 +4,10 @@ HOSTS: strict_variables: platform: debian-8-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-8-amd64-20141121 user: debian CONFIG: type: foss - openstack_network: default log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml new file mode 100644 index 0000000..38c844b --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-8-x64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : vagrant + box : camptocamp/debian-8-amd64 +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml new file mode 100644 index 0000000..a3edb70 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + ubuntu-14.04-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : vagrant + box : puppetlabs/ubuntu-14.04-64-nocm +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3