diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-27 12:01:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-27 12:01:29 +0000 |
| commit | 00d9bbf5549c273bfd4e3cf81dac59c0670d2280 (patch) | |
| tree | 7c6045bbdde1ef3ee62327692f15be2f6291675a | |
| parent | 9f596ffe4f14c6a59ca5bf2feb152f41a8fbdb71 (diff) | |
| parent | f96458fcbfc2b26f47232e312eb6df962533def0 (diff) | |
| download | kolla-00d9bbf5549c273bfd4e3cf81dac59c0670d2280.tar.gz kolla-00d9bbf5549c273bfd4e3cf81dac59c0670d2280.zip | |
Merge "Customizations for openvswitch"
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1dd566438..d959407b6 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -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 diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index b588a094d..64d8fc46d 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -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 }} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 632e54a23..5e6880ce5 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -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 }} |