Move the l3 agent to the neutron_controller

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.
 

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
 

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.

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