openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for openvswitch"

Browse Source
This commit is contained in:
Jenkins 2016-07-27 12:01:29 +00:00 committed by Gerrit Code Review
commit 00d9bbf554
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/openvswitch/openvswitch-base/Dockerfile.j2
View File

@ -1,19 +1,15 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openvswitch \
&& yum clean all
{% set openvswitch_base_packages = ['openvswitch'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \
openvswitch-switch \
&& apt-get clean
{% set openvswitch_base_packages = ['openvswitch-switch'] %}
{% endif %}
RUN {{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

2
docker/openvswitch/openvswitch-db-server/Dockerfile.j2
View File

@ -5,4 +5,6 @@ COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured /usr/local/bin/kolla_openvswitch_extend_start
{% block openvswitch_db_server_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}

2
docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
View File

@ -4,4 +4,6 @@ MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
{% block openvswitch_vswitchd_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}