diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 04:36:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 04:36:35 +0000 |
| commit | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (patch) | |
| tree | 59e3b81a631e215f59cfa0499e7fb12715c26ed6 /docker/services/cinder-volume.yaml | |
| parent | 32c40b97962ce42346b8e335bc342a618c0baded (diff) | |
| parent | 8e5bb308cf0832c1ea3d8aa315542cbfa882b310 (diff) | |
Merge "Refactor iscsi initiator-name reset into separate service"
Diffstat (limited to 'docker/services/cinder-volume.yaml')
| -rw-r--r-- | docker/services/cinder-volume.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 2ecc7adc..3030019c 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -98,6 +98,10 @@ outputs: dest: "/" merge: true preserve_properties: true + - source: "/var/lib/kolla/config_files/src-iscsid/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/cinder owner: cinder:cinder @@ -124,13 +128,13 @@ 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 - - /etc/iscsi:/etc/iscsi - /var/lib/cinder:/var/lib/cinder - /var/log/containers/cinder:/var/log/cinder environment: |