From c641db63dd75272033e60aade60b46c4f4c7f2ff Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Wed, 29 Apr 2015 16:01:27 +0000
Subject: openstack: tidy up cluster morphologies

Change-Id: Ide6df1bb9128585973dfc3eec37fd46c5eda7a68
---
 clusters/openstack-one-node.morph             |  3 +--
 clusters/openstack-three-node-installer.morph | 13 +++++++------
 clusters/openstack-two-node-installer.morph   |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index be229084..b2971841 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -55,7 +55,6 @@ systems:
       CONTROLLER_HOST_ADDRESS: onenode
       MANAGEMENT_INTERFACE_IP_ADDRESS: <management ip>
 
-
       KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
       KEYSTONE_ADMIN_PASSWORD: veryinsecure
       KEYSTONE_DB_USER: keystoneDB
@@ -71,7 +70,7 @@ systems:
       NOVA_DB_USER: novaDB
       NOVA_DB_PASSWORD: veryinsecure
       NOVA_VIRT_TYPE: qemu
-      #NOVA_BAREMETAL_SCHEDULING: no
+      NOVA_BAREMETAL_SCHEDULING: no
 
       CINDER_SERVICE_USER: cinder
       CINDER_SERVICE_PASSWORD: veryinsecure
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index 150506d0..af293232 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -107,6 +107,7 @@ systems:
         NOVA_DB_USER: novaDB
         NOVA_DB_PASSWORD: veryinsecure
         NOVA_VIRT_TYPE: kvm
+        NOVA_BAREMETAL_SCHEDULING: no
 
         CINDER_ENABLE_CONTROLLER: False
         CINDER_ENABLE_COMPUTE: False
@@ -172,6 +173,10 @@ systems:
 
         NOVA_ENABLE_CONTROLLER: True
 
+        CINDER_ENABLE_CONTROLLER: True
+        CINDER_ENABLE_COMPUTE: False
+        CINDER_ENABLE_STORAGE: False
+
         NEUTRON_ENABLE_AGENT: False
         NEUTRON_ENABLE_MANAGER: False
         NEUTRON_ENABLE_CONTROLLER: True
@@ -179,10 +184,6 @@ systems:
 
         IRONIC_ENABLE_SERVICE: True
 
-        CINDER_ENABLE_CONTROLLER: True
-        CINDER_ENABLE_COMPUTE: False
-        CINDER_ENABLE_STORAGE: False
-
         CEILOMETER_ENABLE_CONTROLLER: True
         CEILOMETER_ENABLE_COMPUTE: False
 
@@ -209,12 +210,12 @@ systems:
         <<: *stack-node
         HOSTNAME: threenode-compute
 
+        NOVA_ENABLE_COMPUTE: True
+
         CINDER_ENABLE_CONTROLLER: False
         CINDER_ENABLE_COMPUTE: True
         CINDER_ENABLE_STORAGE: True
 
-        NOVA_ENABLE_COMPUTE: True
-
         NEUTRON_ENABLE_AGENT: True
         NEUTRON_ENABLE_MANAGER: False
         NEUTRON_ENABLE_CONTROLLER: False
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index dd0bfd58..7295a534 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -106,6 +106,7 @@ systems:
         NOVA_DB_USER: novaDB
         NOVA_DB_PASSWORD: veryinsecure
         NOVA_VIRT_TYPE: kvm
+        NOVA_BAREMETAL_SCHEDULING: no
 
         CINDER_ENABLE_CONTROLLER: True
         CINDER_ENABLE_COMPUTE: False
-- 
cgit v1.2.1