From 65e059c107ffad30aed47e3c38774e8f33783089 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 --- openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service') diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service index bd514aa1..1a6b5928 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service @@ -1,7 +1,8 @@ [Unit] Description=Neutron Layer 3 Agent -After=network-online.target openstack-neutron-ovs-cleanup.service -Wants=network-online.target +ConditionPathExists=/etc/neutron/neutron.conf +After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service openstack-neutron-ovs-cleanup.service +Wants=network-online.target openstack-neutron-config-setup.service [Service] Type=simple -- cgit v1.2.1