From cbbbca7493e907a0670c2cff39d8d341ce2915d8 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Tue, 28 Apr 2015 13:12:12 +0000
Subject: openstack: enable keystone only in the controller

Change-Id: I43f1cd43645ff8358a1d8d699352438633124038
---
 clusters/openstack-one-node.morph             | 1 +
 clusters/openstack-three-node-installer.morph | 3 +++
 clusters/openstack-two-node-installer.morph   | 3 +++
 3 files changed, 7 insertions(+)

(limited to 'clusters')

diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index b2971841..497a0ba4 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -55,6 +55,7 @@ systems:
       CONTROLLER_HOST_ADDRESS: onenode
       MANAGEMENT_INTERFACE_IP_ADDRESS: <management ip>
 
+      KEYSTONE_ENABLE_SERVICE: True
       KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
       KEYSTONE_ADMIN_PASSWORD: veryinsecure
       KEYSTONE_DB_USER: keystoneDB
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index af293232..ff82f20f 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -90,6 +90,7 @@ systems:
         RABBITMQ_PASSWORD: veryinsecure
 
         # This token needs to be unique and secret
+        KEYSTONE_ENABLE_SERVICE: False
         KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
         KEYSTONE_ADMIN_PASSWORD: veryinsecure
         KEYSTONE_DB_USER: keystoneDB
@@ -171,6 +172,8 @@ systems:
         <<: *stack-node
         HOSTNAME: threenode-controller
 
+        KEYSTONE_ENABLE_SERVICE: True
+
         NOVA_ENABLE_CONTROLLER: True
 
         CINDER_ENABLE_CONTROLLER: True
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index 7295a534..93d126bc 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -89,6 +89,7 @@ systems:
         RABBITMQ_PASSWORD: veryinsecure
 
         # This token needs to be unique and secret
+        KEYSTONE_ENABLE_SERVICE: True
         KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
         KEYSTONE_ADMIN_PASSWORD: veryinsecure
         KEYSTONE_DB_USER: keystoneDB
@@ -168,6 +169,8 @@ systems:
         <<: *stack-node
         HOSTNAME: twonode-compute
 
+        KEYSTONE_ENABLE_SERVICE: False
+
         NOVA_ENABLE_COMPUTE: True
         NOVA_ENABLE_CONTROLLER: False
 
-- 
cgit v1.2.1