Merge "Refactor iscsi initiator-name reset into separate service"

diff --cc ci/environments/multinode-containers.yaml
Simple merge

diff --cc ci/environments/multinode.yaml
Simple merge

diff --cc ci/environments/multinode_major_upgrade.yaml
Simple merge

diff --cc ci/environments/scenario002-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario002-multinode.yaml
Simple merge

diff --cc ci/environments/scenario003-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario003-multinode.yaml
Simple merge

diff --cc ci/environments/scenario004-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario004-multinode.yaml
Simple merge

diff --cc docker/services/cinder-volume.yaml
index 2ecc7ad,6f6160f..3030019
--- 1/docker/services/cinder-volume.yaml
--- 2/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@@ -124,9 -122,9 +128,10 @@@ outputs
                  -
                    - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
                    - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                   - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                    # FIXME: we need to generate a ceph.conf with puppet for this
                    - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro
 +                  - /lib/modules:/lib/modules:ro
                    - /dev/:/dev/
                    - /run/:/run/
                    - /sys:/sys

diff --cc overcloud-resource-registry-puppet.j2.yaml
Simple merge

diff --cc roles/README.rst
Simple merge