summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-04-14 18:54:57 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-17 15:35:24 +0000
commit16ec568ee57045464cd2435358a28c25820a6a61 (patch)
treeed4a0f5936c03ba7e49db11f6d056b5b9ce15136 /clusters
parentf1baa4ade17fcd1eaa2fed4aecf3901c414acc9a (diff)
downloaddefinitions-16ec568ee57045464cd2435358a28c25820a6a61.tar.gz
OpenStack: Split nova into control and compute
This adds NOVA_ENABLE_{CONTROLLER,COMPUTE}. Both are enabled by deafult, but if CONTROLLER is enabled but COMPUTE isn't, then the conductor service is enabled. Change-Id: I523a7270d4afdcd1e2a30eaac42ea499581fe971
Diffstat (limited to 'clusters')
-rw-r--r--clusters/openstack-installer.morph4
1 files changed, 4 insertions, 0 deletions
diff --git a/clusters/openstack-installer.morph b/clusters/openstack-installer.morph
index 5cc7c5d1..2f2cbd02 100644
--- a/clusters/openstack-installer.morph
+++ b/clusters/openstack-installer.morph
@@ -77,6 +77,8 @@ systems:
NEUTRON_ENABLE_AGENT: False
NEUTRON_ENABLE_MANAGER: True
NEUTRON_ENABLE_CONTROLLER: False
+ NOVA_ENABLE_CONTROLLER: False
+ NOVA_ENABLE_COMPUTE: False
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
HOSTS_SELF: 10.24.1.83 threenode-network
HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt
@@ -113,6 +115,7 @@ systems:
NEUTRON_ENABLE_AGENT: False
NEUTRON_ENABLE_MANAGER: False
NEUTRON_ENABLE_CONTROLLER: True
+ NOVA_ENABLE_CONTROLLER: True
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
HOSTS_SELF: 10.0.0.2 threenode-controller
EXTERNAL_INTERFACE: enp2s0
@@ -145,6 +148,7 @@ systems:
NEUTRON_ENABLE_AGENT: True
NEUTRON_ENABLE_MANAGER: False
NEUTRON_ENABLE_CONTROLLER: False
+ NOVA_ENABLE_COMPUTE: True
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
HOSTS_SELF: 10.0.0.3 threenode-compute
EXTERNAL_INTERFACE: eno1