7ca1e19e06
Make the changes needed to support Ubuntu Additionally, adjust the way supervisor is installed. Rather than installing via pip, install via a package. Change-Id: I1e7f538a180e4e35166d5afa8ba3f165b7e9f6d5 Partially-Implements: blueprint install-from-ubuntu Closes-Bug: #1487715
34 lines
1.1 KiB
Django/Jinja
34 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }}
|
|
MAINTAINER Kolla Project (https://launchpad.net.kolla)
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
|
|
|
|
RUN yum install -y 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/ /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"]
|