diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2015-03-16 14:56:13 +0100 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2015-03-16 14:56:13 +0100 |
| commit | 4e95d08533c59ea1fef8095db020484ec4d1131c (patch) | |
| tree | 880ac0f7e59d102cd29e58d54de35f741e8ee728 | |
| parent | df5db9545d6c4558769be1268f6ae06fe5906712 (diff) | |
| download | puppet-dhcp-4e95d08533c59ea1fef8095db020484ec4d1131c.tar.gz puppet-dhcp-4e95d08533c59ea1fef8095db020484ec4d1131c.tar.bz2 | |
Add debian-8-x86_64-vagrant
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 10 |
5 files changed, 15 insertions, 5 deletions
@@ -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/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-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 |