From 16feb3c5ddf4fe0068185db3ea809996e6f40c43 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 14 Apr 2015 13:00:50 +0000 Subject: OpenStack: Split neutron config up into MANAGER, CONTROLLER and AGENT This adds NEUTRON_ENABLE_{MANAGER,CONTROLLER,AGENT} to determine which parts should be run on a node, so a network node has MANAGER enabled, but doesn't need CONTROLLER or AGENT, since those will be run on the controller and compute nodes respectively. This works by the configuration extension selectively enabling systemd units, with config-setup always being run, and db-setup run on the controller node. Rather than having the enable logic in 3 distinct setup services, their dependencies have been augmented to run after appropriate setup services if they are enabled, and to not run if their configuration hasn't been created. Change-Id: I7625074c94acfb49fc68660440609b0fe9c0052d --- clusters/openstack-installer.morph | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'clusters') diff --git a/clusters/openstack-installer.morph b/clusters/openstack-installer.morph index 4103ea07..5cc7c5d1 100644 --- a/clusters/openstack-installer.morph +++ b/clusters/openstack-installer.morph @@ -74,6 +74,9 @@ systems: NEUTRON_SERVICE_PASSWORD: veryinsecure NEUTRON_DB_USER: neutronDB NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_ENABLE_AGENT: False + NEUTRON_ENABLE_MANAGER: True + NEUTRON_ENABLE_CONTROLLER: False METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret HOSTS_SELF: 10.24.1.83 threenode-network HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt @@ -107,6 +110,9 @@ systems: CINDER_DB_USER: cinderDB CINDER_DB_PASSWORD: veryinsecure CINDER_DEVICE: /dev/sdb + NEUTRON_ENABLE_AGENT: False + NEUTRON_ENABLE_MANAGER: False + NEUTRON_ENABLE_CONTROLLER: True METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret HOSTS_SELF: 10.0.0.2 threenode-controller EXTERNAL_INTERFACE: enp2s0 @@ -136,6 +142,9 @@ systems: CINDER_DB_USER: cinderDB CINDER_DB_PASSWORD: veryinsecure CINDER_DEVICE: /dev/sdb + NEUTRON_ENABLE_AGENT: True + NEUTRON_ENABLE_MANAGER: False + NEUTRON_ENABLE_CONTROLLER: False METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret HOSTS_SELF: 10.0.0.3 threenode-compute EXTERNAL_INTERFACE: eno1 -- cgit v1.2.1