diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-04-14 13:00:50 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-17 15:35:24 +0000 |
| commit | f1baa4ade17fcd1eaa2fed4aecf3901c414acc9a (patch) | |
| tree | 64c52a84fb808aa6853d583a53e46c98b7f1b35c /openstack/manifest | |
| parent | da6201b2e28b41a55547941ed181f2a6b413e61d (diff) | |
| download | definitions-f1baa4ade17fcd1eaa2fed4aecf3901c414acc9a.tar.gz | |
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
Diffstat (limited to 'openstack/manifest')
| -rw-r--r-- | openstack/manifest | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack/manifest b/openstack/manifest index 7911827d..6b7e27d7 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -37,7 +37,8 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0100644 0 0 /usr/share/openstack/keystone/keystone-paste.ini 0100644 0 0 /usr/share/openstack/network.yml 0040755 0 0 /usr/share/openstack/neutron -0100644 0 0 /usr/share/openstack/neutron.yml +0100644 0 0 /usr/share/openstack/neutron-config.yml +0100644 0 0 /usr/share/openstack/neutron-db.yml 0100644 0 0 /usr/share/openstack/neutron/neutron.conf 0100644 0 0 /usr/share/openstack/neutron/api-paste.ini 0100644 0 0 /usr/share/openstack/neutron/policy.json @@ -130,7 +131,8 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0100644 0 0 /usr/lib/systemd/system/openstack-ironic-api.service 0100644 0 0 /usr/lib/systemd/system/openstack-ironic-conductor.service 0100644 0 0 /usr/lib/systemd/system/openstack-network-setup.service -0100644 0 0 /usr/lib/systemd/system/openstack-neutron-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-config-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-db-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-server.service 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-metadata-agent.service 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service |