aboutsummaryrefslogtreecommitdiff
path: root/docker/iscsid
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-05 16:53:34 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-09-27 07:40:06 +0000
commit878b00013b01e3d02a704ce7c9fac1629cd1a705 (patch)
tree218b3a4d1470a0c55006577d912d5369d60a8fb5 /docker/iscsid
parentea3ed3f9332dbd7f369ca49806ee04000881c3c7 (diff)
downloadkolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.tar.gz
kolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.zip
Move to CentOS Stream 9
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go. This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is planned as final solution. CI moved to CentOS Stream 9 nodes. Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715 Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
Diffstat (limited to 'docker/iscsid')
-rw-r--r--docker/iscsid/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2
index ca6e44080..091666b5f 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/docker/iscsid/Dockerfile.j2
@@ -26,8 +26,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ 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 /etc/iscsi/initiatorname.iscsi
+ && rm -f /etc/iscsi/initiatorname.iscsi
{% block iscsid_footer %}{% endblock %}
{% block footer %}{% endblock %}