openstack
/
kolla
Code Issues Proposed changes

Merge "Customizations for iscsid"

This commit is contained in:
Jenkins 2016-08-05 08:38:22 +00:00 committed by Gerrit Code Review
parent a0707a52d5 e418a04e35
commit 8c2ecf005a
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docker/iscsid/Dockerfile.j2
View File

@ -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 }}