baf9d93358
Due the to way network namespaces work, they will not survive a container restart. This is not an issue related to Kolla or Neutron but rather an issue with how network namespaces work. This is putting back into place a workaround that was in correctly removed in the past. We simply cleanup the namespace cruft when the neutron-agents container restarts thus avoiding this issue. Change-Id: Ic16f2f766b4fa46347ea14a1ece5a4653c69d779 Closes-Bug: #1511216
44 lines
1.3 KiB
Django/Jinja
44 lines
1.3 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
|
|
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum install -y \
|
|
openvswitch \
|
|
supervisor \
|
|
&& yum clean all
|
|
|
|
COPY supervisord.conf /etc/
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
RUN apt-get install -y --no-install-recommends supervisor \
|
|
&& apt-get clean
|
|
|
|
COPY supervisord.conf /etc/supervisor/
|
|
|
|
{% endif %}
|
|
|
|
# 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
|
|
#
|
|
# This file _does_ _not_ need to exist, you must remove referencing it from the
|
|
# 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 neutron-dhcp-agent/ /var/lib/kolla/neutron-dhcp-agent
|
|
COPY neutron-l3-agent/ /var/lib/kolla/neutron-l3-agent
|
|
COPY neutron-metadata-agent/ /var/lib/kolla/neutron-metadata-agent
|
|
COPY config-sudoers.sh /var/lib/kolla/
|
|
|
|
COPY start.sh /
|
|
|
|
# We will remove this line in Docker 1.10 when namespace propogation works
|
|
VOLUME /run/netns
|
|
|
|
CMD ["/start.sh"]
|
|
|
|
{{ include_footer }}
|