aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Smekel <shaun.smekel@theorem.net.au>2016-08-12 07:52:22 +1000
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-08-18 15:12:13 +0000
commit2e0571aee85290af3d72629e4ef2d37e988dab35 (patch)
treef4cbdf084d44b40550c2c8a9255bee73d38fef22
parent595fa5758626965d5ea1064da02db65d7c617fd0 (diff)
downloadkolla-2e0571aee85290af3d72629e4ef2d37e988dab35.tar.gz
kolla-2e0571aee85290af3d72629e4ef2d37e988dab35.zip
Customizations for Multipathd
This patchset contains customization of Dockerfile of the Multipathd container. Change-Id: Ibf68b538eaa3cdd0fd6f190f234db845459192ec Partially-implements: blueprint third-party-plugin-support
-rw-r--r--docker/multipathd/Dockerfile.j218
1 files changed, 8 insertions, 10 deletions
diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2
index 9c91f91f3..521ae13e2 100644
--- a/docker/multipathd/Dockerfile.j2
+++ b/docker/multipathd/Dockerfile.j2
@@ -1,18 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- device-mapper-multipath \
- && yum clean all
+{% import "macros.j2" as macros with context %}
+{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% 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 }}