From f96458fcbfc2b26f47232e312eb6df962533def0 Mon Sep 17 00:00:00 2001 From: riwinter Date: Mon, 25 Jul 2016 10:08:05 -0400 Subject: Customizations for openvswitch This patchset contains customization of Dockerfiles of openvswitch containers Change-Id: I9404fbee8552d5218ac57abf8a01bf259db729f5 Partially-implements: blueprint third-party-plugin-support --- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'docker/openvswitch/openvswitch-base') 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 -- cgit v1.2.3