Merge "Only mount selinux sysfs in nova_libvirt container" into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / multipathd.yaml

diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index 51b9302..5e01558 100644 (file)
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -59,6 +59,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/multipathd.json:
           command: /usr/sbin/multipathd -d
+          config_files:
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
       docker_config:
         step_3:
           multipathd:
@@ -72,11 +77,11 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                   - /dev/:/dev/
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
                   - /var/lib/cinder:/var/lib/cinder
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
@@ -85,4 +90,3 @@ outputs:
         - name: Stop and disable multipathd service
           tags: step2
           service: name=multipathd state=stopped enabled=no
-      metadata_settings: {}