openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for Tgtd"

Browse Source
This commit is contained in:
Jenkins 2016-08-15 15:16:03 +00:00 committed by Gerrit Code Review
commit ea3891075c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/tgtd/Dockerfile.j2
View File

@ -1,22 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set tgtd_packages = ['scsi-target-utils'] %}
RUN yum -y install \ RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }}
scsi-target-utils \
&& yum clean all
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set tgtd_packages = ['tgt'] %}
RUN apt-get -y install --no-install-recommends \ RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }}
tgt \
&& apt-get clean
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %} {% endif %}
{% block tgtd_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}