From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 24 Jul 2017 04:36:35 +0000 (+0000)
Subject: Merge "Refactor iscsi initiator-name reset into separate service"
X-Git-Tag: opnfv-6.0.0~364
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=84e6bff8a62539b381c5706fab7b8ea90f00f0dd;p=apex-tripleo-heat-templates.git

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

84e6bff8a62539b381c5706fab7b8ea90f00f0dd
diff --cc docker/services/cinder-volume.yaml
index 2ecc7adc,6f6160fa..3030019c
--- a/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