From 2e0571aee85290af3d72629e4ef2d37e988dab35 Mon Sep 17 00:00:00 2001
From: Shaun Smekel <shaun.smekel@theorem.net.au>
Date: Fri, 12 Aug 2016 07:52:22 +1000
Subject: [PATCH] Customizations for Multipathd

This patchset contains customization of Dockerfile of the Multipathd
container.

Change-Id: Ibf68b538eaa3cdd0fd6f190f234db845459192ec
Partially-implements: blueprint third-party-plugin-support
---
 docker/multipathd/Dockerfile.j2 | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2
index 9c91f91f32..521ae13e22 100644
--- a/docker/multipathd/Dockerfile.j2
+++ b/docker/multipathd/Dockerfile.j2
@@ -1,18 +1,16 @@
 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 \
-        device-mapper-multipath \
-    && yum clean all
-
+    {% set multipathd_packages = ['device-mapper-multipath'] %}
 {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        multipath-tools \
-    && apt-get clean
-
+    {% set multipathd_packages = ['multipath-tools'] %}
 {% endif %}
 
+RUN {{ macros.install_packages(multipathd_packages | customizable("packages")) }}
+
+{% block multipathd_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}