diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/iscsid | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/iscsid')
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 36 | ||||
| -rw-r--r-- | docker/iscsid/extend_start.sh | 7 |
2 files changed, 0 insertions, 43 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 deleted file mode 100644 index a1e4bba61..000000000 --- a/docker/iscsid/Dockerfile.j2 +++ /dev/null @@ -1,36 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block iscsid_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set iscsid_packages = [ - 'iscsi-initiator-utils', - 'python3-rtslib', - 'targetcli' - ] %} - -{% elif base_package_type == 'deb' %} - {% set iscsid_packages = [ - 'open-iscsi', - 'python3-rtslib-fb', - 'targetcli-fb' - ] %} - -{% endif %} - -{{ macros.install_packages(iscsid_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -# NOTE(hrw): CentOS Stream 9 lacks initiatorname.iscsi file -RUN chmod 644 /usr/local/bin/kolla_extend_start \ - && rm -f /etc/iscsi/initiatorname.iscsi - -{{ macros.kolla_patch_sources() }} - -{% block iscsid_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/iscsid/extend_start.sh b/docker/iscsid/extend_start.sh deleted file mode 100644 index 78f2317d2..000000000 --- a/docker/iscsid/extend_start.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# check if unique iSCSI initiator name already exists -if [[ ! -f /etc/iscsi/initiatorname.iscsi ]]; then - echo "Generating new iSCSI initiator name" - echo InitiatorName=$(/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi -fi |