diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 17:02:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 17:02:15 +0000 |
| commit | 22103e5c8ca094bad01e9c1f7e1ae2cfc4bcfead (patch) | |
| tree | ed860d14ffbb38ed6cf0c82ba13cf492d1ac1bf4 | |
| parent | dd73e7bf95e5e7c1538d86ba3080ff3ce3f92049 (diff) | |
| parent | 2e0571aee85290af3d72629e4ef2d37e988dab35 (diff) | |
| download | kolla-22103e5c8ca094bad01e9c1f7e1ae2cfc4bcfead.tar.gz kolla-22103e5c8ca094bad01e9c1f7e1ae2cfc4bcfead.zip | |
Merge "Customizations for Multipathd"
| -rw-r--r-- | docker/multipathd/Dockerfile.j2 | 18 |
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 }} |