Partially revert thin neutron containers

Due to a revert in the Docker code, thin neutron containers do not work
at this time. The neutron plugin agents do not need to exist in the same
container as the other agents however. This allows for using either
linuxbridge or openvswitch

The docker commit that did the revert:
https://github.com/docker/docker/commit/ff770d33cdee5ab4dc0bdeb06dcfea49aa72ab8e

Closes-Bug: 1469307
Change-Id: Idf79c31c74c34b93f5a9bac49730aca49bbdb861

compose/neutron-l3-agent.yml → compose/neutron-agents.yml

-neutronl3agent:
-  image: kollaglue/centos-rdo-neutron-l3-agent:latest
-  name: neutron-l3-agent
+neutronagents:
+  image: kollaglue/centos-rdo-neutron-agents:latest
+  name: neutron-agents
   net: "host"
   privileged: true
   restart: always
   volumes:
-    - /run/netns/:/run/netns/:ro
-    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
+    - /var/run/netns/:/var/run/netns/
     - /lib/modules:/lib/modules:ro
   env_file:
    - openstack.env

compose/neutron-dhcp-agent.yml

-neutrondhcpagent:
-  image: kollaglue/centos-rdo-neutron-dhcp-agent:latest
-  name: neutron-dhcp-agent
-  net: "host"
-  privileged: true
-  restart: always
-  volumes:
-    - /run/netns/:/run/netns/:ro
-    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
-    - /lib/modules:/lib/modules:ro
-  env_file:
-   - openstack.env

compose/neutron-linuxbridge-agent.yml

@@ -6,7 +6,6 @@ neutronlinuxbridgeagent:
   restart: always
   volumes:
     - /run/netns/:/run/netns/:ro
-    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
     - /lib/modules:/lib/modules:ro
   env_file:
    - openstack.env

compose/neutron-metadata-agent.yml

-neutronmetadataagent:
-  image: kollaglue/centos-rdo-neutron-metadata-agent:latest
-  name: neutron-metadata-agent
-  net: "host"
-  privileged: true
-  restart: always
-  volumes:
-    - /run/netns/:/run/netns/:ro
-    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
-    - /lib/modules:/lib/modules:ro
-  env_file:
-   - openstack.env

docker/centos/binary/neutron/neutron-l3-agent/Dockerfile → docker/centos/binary/neutron/neutron-agents/Dockerfile

 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
+# Install supervisor
+RUN easy_install supervisor
+
+# Install supervisor-stdout
+RUN pip install supervisor-stdout
+
+# Configure supervisord
+RUN mkdir -p /var/log/supervisor/
+COPY supervisord.conf /etc/
+
 # TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is
 # why this file is needed. To support FWaaS we cannot have a seperate container
 # I need to figure out the best way to make this work together
@@ -9,6 +19,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 # exec line in the start script. Also all these config options can exist in the
 # main neutron.conf if we wish
 COPY fwaas_driver.ini /etc/neutron/
-COPY check.sh start.sh /
 
-CMD ["/start.sh"]
+COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
+COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
+COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
+
+CMD ["/usr/bin/supervisord"]

docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/check.sh

+../../../../../common/neutron/neutron-dhcp-agent/check.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh

+../../../../../common/neutron/neutron-dhcp-agent/start.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/check.sh

+../../../../../common/neutron/neutron-l3-agent/check.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini

+../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh

+../../../../../common/neutron/neutron-l3-agent/start.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/check.sh

+../../../../../common/neutron/neutron-metadata-agent/check.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh

+../../../../../common/neutron/neutron-metadata-agent/start.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-agents/supervisord.conf

+[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-dhcp-agent]
+command=/opt/kolla/neutron-dhcp-agent/start.sh
+priority=40
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:neutron-metadata-agent]
+command=/opt/kolla/neutron-metadata-agent/start.sh
+priority=40
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:neutron-l3-agent]
+command=/opt/kolla/neutron-l3-agent/start.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

docker/centos/binary/neutron/neutron-base/Dockerfile

@@ -7,12 +7,4 @@ RUN yum -y install openstack-neutron \
                    python-oslo-policy \
     && yum clean all
 
-RUN mkdir -p /opt/kolla/host_proc
-
-RUN pip install nsenter \
-    && ln -s 1 /opt/kolla/host_proc/self
-
 COPY config-neutron.sh config-sudoers.sh /opt/kolla/
-
-RUN mv /sbin/ip /opt/kolla/ip
-COPY ip_wrapper.py /sbin/ip

docker/centos/binary/neutron/neutron-dhcp-agent/Dockerfile

-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY check.sh start.sh /
-
-CMD ["/start.sh"]

docker/centos/binary/neutron/neutron-dhcp-agent/check.sh

-../../../../common/neutron/neutron-dhcp-agent/check.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-dhcp-agent/start.sh

-../../../../common/neutron/neutron-dhcp-agent/start.sh
\ No newline at end of file

docker/centos/binary/neutron/neutron-l3-agent/build

-../../../../../tools/build-docker-image
\ No newline at end of file