Merge "Change fat neutron container into thin containers"

11 files changed, 0 insertions, 75 deletions

diff --git a/docker/common/neutron/neutron-agents/config-scripts/config-sudoers.sh b/docker/common/neutron/neutron-agents/config-scripts/config-sudoers.sh
deleted file mode 100755
index 0e02226db..000000000
--- a/docker/common/neutron/neutron-agents/config-scripts/config-sudoers.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Neutron uses rootwrap which requires a tty for sudo.
-# Since the container is running in daemon mode, a tty
-# is not present and requiretty must be commented out.
-if [ ! -f /var/run/sudo-modified ]; then
-    chmod 0640 /etc/sudoers
-    sed -i '/Defaults    requiretty/s/^/#/' /etc/sudoers
-    chmod 0440 /etc/sudoers
-fi
-
-touch /var/run/sudo-modified
diff --git a/docker/common/neutron/neutron-agents/supervisord.conf b/docker/common/neutron/neutron-agents/supervisord.conf
deleted file mode 100644
index 7455cb3d7..000000000
--- a/docker/common/neutron/neutron-agents/supervisord.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-[unix_http_server]
-file = /var/run/supervisor.sock
-
-[inet_http_server]
-port = 127.0.0.1:9001
-
-[supervisord]
-nodaemon=true
-logfile = /var/log/supervisor/supervisord.log
-logfile_maxbytes = 200KB
-logfile_backups = 1
-pidfile = /var/run/supervisord.pid
-childlogdir = /var/log/supervisor
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl = unix:///var/run/supervisor.sock
-
-[program:neutron-linuxbridge-agent]
-command=/opt/kolla/neutron/config-linuxbridge-agent.sh
-priority=30
-startsec=10
-stderr_events_enabled=true
-stdout_events_enabled=true
-
-[program:neutron-dhcp-agent]
-command=/opt/kolla/neutron/config-dhcp-agent.sh
-priority=40
-startsec=10
-stderr_events_enabled=true
-stdout_events_enabled=true
-
-[program:neutron-metadata-agent]
-command=/opt/kolla/neutron/config-metadata-agent.sh
-priority=40 
-startsec=10
-stderr_events_enabled=true
-stdout_events_enabled=true
-
-[program:neutron-l3-agent]
-command=/opt/kolla/neutron/config-l3-agent.sh
-priority=40
-startsec=10
-stderr_events_enabled=true
-stdout_events_enabled=true
-
-[eventlistener:stdout]
-command = supervisor_stdout
-buffer_size = 100
-events = PROCESS_LOG
-result_handler = supervisor_stdout:event_handler
diff --git a/docker/common/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh b/docker/common/neutron/neutron-dhcp-agent/check.sh
index 7dda736ef..7dda736ef 100755
--- a/docker/common/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/check.sh
diff --git a/docker/common/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh
index db71678b1..c3056fdb4 100755
--- a/docker/common/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/start.sh
@@ -79,10 +79,5 @@ dhcp-option-force=26,1450
 log-facility=${NEUTRON_LOG_DIR}/neutron-dnsmasq.log
 EOF
 
-# Remove any existing qdhcp namespaces
-ip netns list | grep qdhcp | while read -r line ; do
-    ip netns delete $line
-done
-
 # Start DHCP Agent
 exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
diff --git a/docker/common/neutron/neutron-agents/check-scripts/check-l3-agent.sh b/docker/common/neutron/neutron-l3-agent/check.sh
index d32c1e272..d32c1e272 100755
--- a/docker/common/neutron/neutron-agents/check-scripts/check-l3-agent.sh
+++ b/docker/common/neutron/neutron-l3-agent/check.sh
diff --git a/docker/common/neutron/neutron-agents/fwaas_driver.ini b/docker/common/neutron/neutron-l3-agent/fwaas_driver.ini
index 41f761abf..41f761abf 100644
--- a/docker/common/neutron/neutron-agents/fwaas_driver.ini
+++ b/docker/common/neutron/neutron-l3-agent/fwaas_driver.ini
diff --git a/docker/common/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/common/neutron/neutron-l3-agent/start.sh
index 761d07685..4780341fb 100755
--- a/docker/common/neutron/neutron-agents/config-scripts/config-l3-agent.sh
+++ b/docker/common/neutron/neutron-l3-agent/start.sh
@@ -76,10 +76,5 @@ elif [ "${USE_NAMESPACES}" == "true" ] ; then
         "true"
 fi
 
-# Remove any existing qrouter namespaces
-ip netns list | grep qrouter | while read -r line ; do
-    ip netns delete $line
-done
-
 # Start L3 Agent
 exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-dir /etc/neutron
diff --git a/docker/common/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh b/docker/common/neutron/neutron-linuxbridge-agent/check.sh
index 4485fc1ec..4485fc1ec 100755
--- a/docker/common/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/check.sh
diff --git a/docker/common/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
index bd8f90194..bd8f90194 100755
--- a/docker/common/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
diff --git a/docker/common/neutron/neutron-agents/check-scripts/check-metadata-agent.sh b/docker/common/neutron/neutron-metadata-agent/check.sh
index fd1c6812b..fd1c6812b 100755
--- a/docker/common/neutron/neutron-agents/check-scripts/check-metadata-agent.sh
+++ b/docker/common/neutron/neutron-metadata-agent/check.sh
diff --git a/docker/common/neutron/neutron-agents/config-scripts/config-metadata-agent.sh b/docker/common/neutron/neutron-metadata-agent/start.sh
index d1eef341c..d1eef341c 100755
--- a/docker/common/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
+++ b/docker/common/neutron/neutron-metadata-agent/start.sh