From f96458fcbfc2b26f47232e312eb6df962533def0 Mon Sep 17 00:00:00 2001
From: riwinter <riwinter@cisco.com>
Date: Mon, 25 Jul 2016 10:08:05 -0400
Subject: [PATCH] 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 ++++--------
.../openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 ++
.../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 1dd5664382..d959407b6f 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 b588a094dc..64d8fc46dc 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 632e54a23c..5e6880ce58 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 }}