X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fservices%2Fmultipathd.yaml;h=51b930291644f3ad7b15caf78f6b970522d6868c;hb=8a305da32aaff257e01691e7d0f61abb4ed75bf3;hp=d8927d4be17c345bffd5ff09d535274d95080d08;hpb=96813ba2683552860c68d99931aa77cd6a0bf391;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index d8927d4b..51b93029 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,10 +55,7 @@ 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
@@ -64,7 +63,7 @@ outputs:
         step_3:
           multipathd:
             start_order: 1
-            image: *multipathd_image
+            image: {get_param: DockerMultipathdImage}
             net: host
             privileged: true
             restart: always