From 2fc520a2ab6e6bf1649e3410162a638c67858e3c Mon Sep 17 00:00:00 2001 From: Egon Rijpkema Date: Mon, 16 Jul 2018 14:16:45 +0200 Subject: [PATCH] Move the l3 agent to the neutron_controller --- neutron_controller/run.sh | 7 +++++++ neutron_controller/write_conf.sh | 7 ------- nova_compute/run.sh | 7 ------- nova_compute/write_conf.sh | 8 ++++++++ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/neutron_controller/run.sh b/neutron_controller/run.sh index 4f1fbae..9c282ca 100755 --- a/neutron_controller/run.sh +++ b/neutron_controller/run.sh @@ -29,6 +29,13 @@ neutron-metadata-agent \ --config-dir /etc/neutron/ \ -v -d & +sleep 3 +neutron-l3-agent \ +--config-file /etc/neutron/l3_agent.ini \ +--config-file /etc/neutron/neutron.conf \ +--config-file /etc/neutron/metadata_agent.ini \ +--config-dir /etc/neutron/ \ +-v -d & # If any process fails, kill the rest. # This ensures the container stops and systemd will restart it. diff --git a/neutron_controller/write_conf.sh b/neutron_controller/write_conf.sh index 4365260..153ada7 100755 --- a/neutron_controller/write_conf.sh +++ b/neutron_controller/write_conf.sh @@ -74,13 +74,6 @@ metadata_proxy_shared_secret = $METADATA_SECRET EOF -cat << EOF > /etc/neutron/l3_agent.ini - -[DEFAULT] -interface_driver = linuxbridge -external_network_bridge = - -EOF cat << EOF > /etc/neutron/plugins/ml2/linuxbridge_agent.ini diff --git a/nova_compute/run.sh b/nova_compute/run.sh index abbb96a..f33fee9 100755 --- a/nova_compute/run.sh +++ b/nova_compute/run.sh @@ -27,13 +27,6 @@ neutron-metadata-agent \ --config-dir /etc/neutron/ \ -v -d & -sleep 3 -neutron-l3-agent \ ---config-file /etc/neutron/l3_agent.ini \ ---config-file /etc/neutron/neutron.conf \ ---config-file /etc/neutron/metadata_agent.ini \ ---config-dir /etc/neutron/ \ --v -d & # If any process fails, kill the rest. # This ensures the container stops and systemd will restart it. diff --git a/nova_compute/write_conf.sh b/nova_compute/write_conf.sh index f0baa3f..c7f9189 100755 --- a/nova_compute/write_conf.sh +++ b/nova_compute/write_conf.sh @@ -297,3 +297,11 @@ osd pool default size = $OSD_POOL_DEFAULT_SIZE [client.compute] keyring = /etc/ceph/ceph.client.compute.keyring EOF + +cat << EOF > /etc/neutron/l3_agent.ini + +[DEFAULT] +interface_driver = linuxbridge +external_network_bridge = + +EOF