From 64b6bd6c501e31569b7ef468e5f11d86202aa00a Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 3 Jun 2021 11:57:07 +0200 Subject: [PATCH] Do not fail if initiatorname.iscsi does not exist In iscsid container image initiatorname.iscsi file is removed as it needs to be different on each container. Until CentOS8, this file was created when installing iscsi-initiator-utils but in CentOS 9 preview this file is created by a systemd service if it does not exist, so we shouldn't assume it will always exist. Change-Id: Iae51282a61d16edb5a67162fca42ffcca7ba5d80 --- container-images/tcib/base/os/iscsid/iscsid.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-images/tcib/base/os/iscsid/iscsid.yaml b/container-images/tcib/base/os/iscsid/iscsid.yaml index d8a2abfaf..9833201d0 100644 --- a/container-images/tcib/base/os/iscsid/iscsid.yaml +++ b/container-images/tcib/base/os/iscsid/iscsid.yaml @@ -2,7 +2,7 @@ tcib_actions: - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - copy: /usr/share/tripleo-common/container-images/kolla/iscsid/extend_start.sh /usr/local/bin/kolla_extend_start - run: chmod 755 /usr/local/bin/kolla_extend_start -- run: rm /etc/iscsi/initiatorname.iscsi +- run: rm -f /etc/iscsi/initiatorname.iscsi - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/iscsid /openstack/healthcheck && chmod a+rx /openstack/healthcheck tcib_gather_files: '{{ lookup(''fileglob'', ''/usr/share/tripleo-common/container-images/kolla/iscsid/*'', wantlist=True) }}' tcib_packages: