From 8e5bb308cf0832c1ea3d8aa315542cbfa882b310 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Mon, 10 Jul 2017 15:51:20 +0100 Subject: Refactor iscsi initiator-name reset into separate service This currently assumes nova-compute and iscsid run in the same context which isn't true for a containerized deployment Change-Id: I11232fc412adcc18087928c281ba82546388376e Depends-On: I91f1ce7625c351745dbadd84b565d55598ea5b59 Depends-On: I0cbb1081ad00b2202c9d913e0e1759c2b95612a5 --- docker/services/cinder-volume.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/services/cinder-volume.yaml') diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 1f9003e6..6f6160fa 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -92,6 +92,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 @@ -118,12 +122,12 @@ 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 - /dev/:/dev/ - /run/:/run/ - /sys:/sys - - /etc/iscsi:/etc/iscsi - /var/lib/cinder:/var/lib/cinder - /var/log/containers/cinder:/var/log/cinder environment: -- cgit 1.2.3-korg