aa59f0db6f
backport: Stein During the switch to Stein UCA, we did not switch all packages to python 3 for Debian/Ubuntu binary images. This change switches some more of those packages. Change-Id: I0bff21384d88ea678608392de2db1ba418c96665 Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
72 lines
2.0 KiB
Django/Jinja
72 lines
2.0 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block cinder_volume_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set cinder_volume_packages = [
|
|
'nfs-utils',
|
|
'nvmetcli',
|
|
'scsi-target-utils',
|
|
'sysfsutils',
|
|
'targetcli'
|
|
] %}
|
|
|
|
{% if distro_python_version.startswith('3') %}
|
|
{% set cinder_volume_packages = cinder_volume_packages + [
|
|
'python3-rtslib',
|
|
] %}
|
|
{% else %}
|
|
{% set cinder_volume_packages = cinder_volume_packages + [
|
|
'python-rtslib',
|
|
] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_redhat_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
|
{% endblock %}
|
|
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set cinder_volume_packages = [
|
|
'nfs-common',
|
|
'sysfsutils',
|
|
'python3-rtslib-fb',
|
|
'targetcli-fb',
|
|
'thin-provisioning-tools',
|
|
'tgt'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_ubuntu_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
|
|
{% endblock %}
|
|
|
|
{% endif %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'deb' %}
|
|
{% set cinder_volume_packages = [
|
|
'cinder-volume',
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_volume_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \
|
|
&& chmod 755 /usr/local/bin/kolla_cinder_extend_start
|
|
|
|
{% block cinder_volume_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER cinder
|