summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMickaël Canévet <mickael.canevet@camptocamp.com>2015-03-24 10:06:18 +0100
committerMickaël Canévet <mickael.canevet@camptocamp.com>2015-03-24 10:06:18 +0100
commitc9cd0c5094b64fb2d4e76899eaccad9ba4033534 (patch)
tree69fc68e5f77b64aadb645e50f18c2b37121e6547 /spec
parente4cb2ed3516c12b85eb7cf1856fcc3d9e136e5c9 (diff)
Update with msync
Diffstat (limited to 'spec')
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-openstack.yml2
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml2
-rw-r--r--spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml2
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-openstack.yml2
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml3
-rw-r--r--spec/acceptance/nodesets/debian-8-x86_64-openstack.yml4
-rw-r--r--spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml10
-rw-r--r--spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml10
8 files changed, 27 insertions, 8 deletions
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