From 99641538cc237c2e3b89341ea0b6c5717f1c9c22 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sbadia@redhat.com>
Date: Tue, 19 May 2015 16:09:47 -0700
Subject: [PATCH] Synchronize nodeset (split trusty and centos)

Separate nodepool files to have trusty & centos7 support
in OpenStack infra.

Fix default definition and centos/trusy defs using Colleen
trusty changes on https://review.openstack.org/#/c/182080

Change-Id: Idc677c214b1ea431b96f18ab6f1d3e0de7e76585
---
 moduleroot/spec/acceptance/nodesets/centos-70-x64.yml | 11 +++++++++++
 moduleroot/spec/acceptance/nodesets/default.yml       | 10 ++++++----
 .../spec/acceptance/nodesets/nodepool-centos7.yml     |  2 +-
 .../spec/acceptance/nodesets/nodepool-trusty.yml      |  4 ++--
 .../acceptance/nodesets/ubuntu-server-1404-x64.yml    | 11 +++++++++++
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 moduleroot/spec/acceptance/nodesets/centos-70-x64.yml
 create mode 100644 moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

diff --git a/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml b/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml
new file mode 100644
index 0000000..5f097e9
--- /dev/null
+++ b/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-server-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: puppetlabs/centos-7.0-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: foss
diff --git a/moduleroot/spec/acceptance/nodesets/default.yml b/moduleroot/spec/acceptance/nodesets/default.yml
index a2c1ecc..3bb3e62 100644
--- a/moduleroot/spec/acceptance/nodesets/default.yml
+++ b/moduleroot/spec/acceptance/nodesets/default.yml
@@ -1,9 +1,11 @@
 HOSTS:
-  ubuntu-14.04-amd64:
+  ubuntu-server-1404-x64:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
-    ip: 127.0.0.1
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
 CONFIG:
-  type: foss
+  log_level: debug
+  type: git
diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml b/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml
index 575ae67..c552874 100644
--- a/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml
+++ b/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml
@@ -3,7 +3,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss
diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml b/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml
index a95d9f3..7f503ca 100644
--- a/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml
+++ b/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml
@@ -1,9 +1,9 @@
 HOSTS:
-  ubuntu-14.04-amd64:
+  ubuntu-1404-x64:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss
diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644
index 0000000..3bb3e62
--- /dev/null
+++ b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: git