X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmultipathd.yaml;h=a0c02f30f4cc81a967eec37615c0eaa3bbe4de37;hb=13c936c067807de5e6a330c4944408313b093bb2;hp=d8927d4be17c345bffd5ff09d535274d95080d08;hpb=d68a938d14f6eb9d143cd9abee9ff5e2d16ae6dd;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index d8927d4b..a0c02f30 100644
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -4,19 +4,21 @@ description: >
   OpenStack containerized Multipathd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMultipathdImage:
     description: image
-    default: 'centos-binary-multipathd:latest'
+    type: string
+  DockerMultipathdConfigImage:
+    description: The container image to use for the multipathd config_volume
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -53,18 +55,20 @@ outputs:
         config_volume: multipathd
         #puppet_tags: file
         step_config: ''
-        config_image: &multipathd_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
+        config_image: {get_param: DockerMultipathdConfigImage}
       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:
             start_order: 1
-            image: *multipathd_image
+            image: {get_param: DockerMultipathdImage}
             net: host
             privileged: true
             restart: always
@@ -73,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