3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 2015-04-03 - Release 0.1.7

- Confine rspec pinning to ruby 1.8
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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', '< 3.2', :require => false if RUBY_VERSION =~ /^1.8/
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint', :require => false
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camptocamp-systemd",
"version": "0.1.6",
"version": "0.1.7",
"author": "Camptocamp",
"summary": "Puppet Systemd module",
"license": "Apache-2.0",
Expand Down
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/centos-6-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
centos-6-x64:
default_apply_opts:
strict_variables:
platform: el-6-x86_64
hypervisor : docker
image: centos:6
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
HOSTS:
centos-6-x64:
default_apply_opts:
strict_variables:
platform: el-6-x86_64
hypervisor : openstack
flavor: m1.small
image: centos-6-latest
user: root
CONFIG:
type: foss
log_level: debug
openstack_network: default
10 changes: 10 additions & 0 deletions spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
HOSTS:
centos-6-x64:
default_apply_opts:
strict_variables:
platform: el-6-x86_64
hypervisor : vagrant
box : camptocamp/centos-6-x86_64
CONFIG:
type: foss
log_level: debug
4 changes: 2 additions & 2 deletions spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ HOSTS:
strict_variables:
platform: el-7-x86_64
hypervisor : openstack
flavor: m1.medium
image: centos-7-x86_64-genericcloud-20140929_01
flavor: m1.small
image: centos-7-latest
user: centos
CONFIG:
type: foss
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: el-7-x86_64
hypervisor : vagrant
box : puppetlabs/centos-7.0-64-nocm
box : camptocamp/centos-7-x86_64
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
HOSTS:
debian-6-x64:
default_apply_opts:
strict_variables:
platform: debian-6-amd64
hypervisor : openstack
flavor: m1.small
image: debian-6-latest
user: debian
CONFIG:
type: foss
log_level: debug
openstack_network: default
4 changes: 2 additions & 2 deletions spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ HOSTS:
strict_variables:
platform: debian-7-amd64
hypervisor : openstack
flavor: m1.medium
image: debian-7-amd64-20141121
flavor: m1.small
image: debian-7-latest
user: debian
CONFIG:
type: foss
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: debian-7-amd64
hypervisor : vagrant
box : puppetlabs/debian-7.8-64-nocm
box : camptocamp/debian-7-amd64
CONFIG:
type: foss
log_level: debug
4 changes: 2 additions & 2 deletions spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ HOSTS:
strict_variables:
platform: debian-8-amd64
hypervisor : openstack
flavor: m1.medium
image: debian-8-amd64-20141121
flavor: m1.small
image: debian-8-latest
user: debian
CONFIG:
type: foss
Expand Down