diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-15 15:16:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-15 15:16:03 +0000 |
| commit | ea3891075c3c311245adb499a9abf465cc942292 (patch) | |
| tree | 93d57921715f40e8c461dc4777f121da7fcf7f0d | |
| parent | 6ea99983fcaf13f90efff1c20a3aa20db0af92ba (diff) | |
| parent | 6d84d8616b4c8b1576f3faa2a46723ebec1f5457 (diff) | |
| download | kolla-ea3891075c3c311245adb499a9abf465cc942292.tar.gz kolla-ea3891075c3c311245adb499a9abf465cc942292.zip | |
Merge "Customizations for Tgtd"
| -rw-r--r-- | docker/tgtd/Dockerfile.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index fbf21ec18..d919ec8da 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,22 +1,22 @@ 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 \ - scsi-target-utils \ - && yum clean all +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set tgtd_packages = ['scsi-target-utils'] %} +RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% elif base_distro in ['ubuntu', 'debian'] %} + {% set tgtd_packages = ['tgt'] %} -RUN apt-get -y install --no-install-recommends \ - tgt \ - && apt-get clean - +RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% endif %} +{% block tgtd_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |