Merge "Remove empty metadata_settings from iscsid and multipathd templates"

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

diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index 61b0557..fc749f3 100644 (file)
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -4,23 +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
-    default: 'centos-binary-multipathd:latest'
     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
@@ -57,21 +55,20 @@ 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
+        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:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
+            image: {get_param: DockerMultipathdImage}
             net: host
             privileged: true
             restart: always
@@ -80,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
@@ -93,4 +90,3 @@ outputs:
         - name: Stop and disable multipathd service
           tags: step2
           service: name=multipathd state=stopped enabled=no
-      metadata_settings: {}