Use a single configuration file for specifying docker containers.

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

diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index 61b0557..f201d88 100644 (file)
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -4,17 +4,11 @@ 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
-    default: 'centos-binary-multipathd:latest'
     type: string
   EndpointMap:
     default: {}
@@ -57,10 +51,7 @@ outputs:
         config_volume: multipathd
         #puppet_tags: file
         step_config: ''
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdConfigImage} ]
+        config_image: {get_param: DockerMultipathdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/multipathd.json:
           command: /usr/sbin/multipathd -d
@@ -68,10 +59,7 @@ outputs:
         step_3:
           multipathd:
             start_order: 1
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
+            image: {get_param: DockerMultipathdImage}
             net: host
             privileged: true
             restart: always