From 6b83475558b4cd6b7bbbc1b5acfac32855c697cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
 <mickael.canevet@camptocamp.com>
Date: Tue, 31 Mar 2015 11:42:49 +0200
Subject: Update with msync

---
 spec/acceptance/nodesets/centos-6-x86_64-docker.yml    | 12 ++++++++++++
 spec/acceptance/nodesets/centos-6-x86_64-openstack.yml | 13 +++++++++++++
 spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml   | 10 ++++++++++
 spec/acceptance/nodesets/centos-7-x86_64-openstack.yml |  4 ++--
 spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml   |  2 +-
 spec/acceptance/nodesets/debian-6-x86_64-openstack.yml | 13 +++++++++++++
 spec/acceptance/nodesets/debian-7-x86_64-openstack.yml |  4 ++--
 spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml   |  2 +-
 spec/acceptance/nodesets/debian-8-x86_64-openstack.yml |  4 ++--
 9 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-docker.yml
 create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
 create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
 create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-openstack.yml

diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
new file mode 100644
index 0000000..b88cc95
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
@@ -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
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
new file mode 100644
index 0000000..0291ce5
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
@@ -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
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
new file mode 100644
index 0000000..191329c
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
@@ -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
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
index 2036c0b..b0769b9 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
@@ -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
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index fe0f83b..6f02769 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 : puppetlabs/centos-7.0-64-nocm
+    box : camptocamp/centos-7-x86_64
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
new file mode 100644
index 0000000..276356b
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
@@ -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
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
index c44f917..8c23792 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
@@ -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
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 86c2165..21aee50 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -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
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
index f7b2e50..94fe73a 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
@@ -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
-- 
cgit v1.2.3