2 files changed, 43 insertions, 0 deletions
diff --git a/kolla/docker/iscsid/Dockerfile.j2 b/kolla/docker/iscsid/Dockerfile.j2
new file mode 100644
index 000000000..a1e4bba61
--- /dev/null
+++ b/kolla/docker/iscsid/Dockerfile.j2
@@ -0,0 +1,36 @@
+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/kolla/docker/iscsid/extend_start.sh b/kolla/docker/iscsid/extend_start.sh
new file mode 100644
index 000000000..78f2317d2
--- /dev/null
+++ b/kolla/docker/iscsid/extend_start.sh
@@ -0,0 +1,7 @@
+#!/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