cb4e875ae1
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
45 lines
1.4 KiB
Django/Jinja
45 lines
1.4 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER Kolla Project (https://launchpad.net.kolla)
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install \
|
|
openstack-neutron \
|
|
openstack-neutron-ml2 \
|
|
openvswitch \
|
|
&& yum clean all
|
|
|
|
# TODO (sdake): remove once RDO adds to the openstack-neutron package
|
|
RUN pip install oslo.versionedobjects
|
|
|
|
{% endif %}
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
RUN apt-get install -y --no-install-recommends \
|
|
iptables \
|
|
dnsmasq \
|
|
uuid-runtime \
|
|
ipset \
|
|
openvswitch-switch \
|
|
&& apt-get clean
|
|
|
|
{% endif %}
|
|
|
|
ADD neutron-base-archive /neutron-base-source
|
|
RUN ln -s neutron-base-source/* neutron \
|
|
&& useradd --user-group neutron \
|
|
&& pip --no-cache-dir install /neutron \
|
|
&& mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \
|
|
&& cp -r /neutron/etc/* /etc/neutron/ \
|
|
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \
|
|
&& cp /neutron/etc/api-paste.ini /usr/share/neutron \
|
|
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
|
|
&& chown -R neutron: /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start
|