diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-13 03:04:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-13 03:04:43 +0000 |
| commit | 349f46950be0abc388b8f3611a829d2e3d2fc954 (patch) | |
| tree | 22e27618d121ec8db73d017ccaa06f66af83d9c8 /docker | |
| parent | b7f61a2f3554abe8a3596dd7dcd5dd63ff058a14 (diff) | |
| parent | 19a40963f724d6b82dac7a95fad2d6ba17690840 (diff) | |
| download | kolla-349f46950be0abc388b8f3611a829d2e3d2fc954.tar.gz kolla-349f46950be0abc388b8f3611a829d2e3d2fc954.zip | |
Merge "iscsi initiator names must be unique among hosts"
Diffstat (limited to 'docker')
| -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 |