diff options
| author | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2016-08-10 16:36:21 +0300 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2016-08-10 17:09:50 +0300 |
| commit | 19a40963f724d6b82dac7a95fad2d6ba17690840 (patch) | |
| tree | cfe5059278ee905fa39926be50ba4b03acd1d0d7 | |
| parent | 54c745fc36820383fb52fc76075eaf826107c102 (diff) | |
| download | kolla-19a40963f724d6b82dac7a95fad2d6ba17690840.tar.gz kolla-19a40963f724d6b82dac7a95fad2d6ba17690840.zip | |
iscsi initiator names must be unique among hosts
Initiator names are generated during image build and therefore are
not unique in multi-host environment. Instead the names should be
autogenerated during first start of iscsid containers.
Change-Id: Ia439b1563c9c9d6c26d8a314fe2817ba493dacb5
Closes-Bug: 1611775
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/iscsid/extend_start.sh | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 3caf0b94e..9b6e43e25 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -21,6 +21,10 @@ MAINTAINER {{ maintainer }} RUN {{ macros.install_packages(iscsid_packages | customizable("packages")) }} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && rm /etc/iscsi/initiatorname.iscsi + {% block iscsid_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/iscsid/extend_start.sh b/docker/iscsid/extend_start.sh new file mode 100644 index 000000000..78f2317d2 --- /dev/null +++ b/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 |