diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-05 08:38:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-05 08:38:22 +0000 |
| commit | 8c2ecf005ac8914f229db86ae7ecf3c701a32679 (patch) | |
| tree | 3ac7110ff73c1cb49ee00e6fcfc692bb0d1d480b | |
| parent | a0707a52d56b7f64e6c9ad002a4ddc7565446c1d (diff) | |
| parent | e418a04e35e8169f5d9e933cdbcd964de529e8f6 (diff) | |
| download | kolla-8c2ecf005ac8914f229db86ae7ecf3c701a32679.tar.gz kolla-8c2ecf005ac8914f229db86ae7ecf3c701a32679.zip | |
Merge "Customizations for iscsid"
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 7c38ad79c..3caf0b94e 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -1,22 +1,26 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% import "macros.j2" as macros with context %} -RUN yum -y install \ - iscsi-initiator-utils \ - targetcli \ - python-rtslib \ - && yum clean all +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set iscsid_packages = [ + 'iscsi-initiator-utils', + 'targetcli', + 'python-rtslib' + ] %} {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get -y install --no-install-recommends \ - open-iscsi \ - targetcli \ - python-rtslib \ - && apt-get clean + {% set iscsid_packages = [ + 'open-iscsi', + 'targetcli', + 'python-rtslib' + ] %} {% endif %} +RUN {{ macros.install_packages(iscsid_packages | customizable("packages")) }} + +{% block iscsid_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |