Merge "Fix malformed mistal_executor kolla config file"

ci/environments/scenario009-multinode.yaml

@@ -6,7 +6,6 @@ resource_registry:
   OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml
   OS::TripleO::Services::OpenShift::Infra: ../../extraconfig/services/openshift-infra.yaml
 
-
 parameter_defaults:
   ControllerServices:
     - OS::TripleO::Services::DisableUnbound

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -134,17 +134,18 @@ outputs:
         /var/lib/kolla/config_files/mistral_executor.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
           config_files:
-            - source: "/var/lib/kolla/config_files/src/*"
+            list_concat:
-              dest: "/"
+              - - source: "/var/lib/kolla/config_files/src/*"
-              merge: true
+                  dest: "/"
-              preserve_properties: true
+                  merge: true
-            - if:
+                  preserve_properties: true
-              - undercloud_config_file_path_unset
+              - if:
-              - ''
+                - undercloud_config_file_path_unset
-              - source: '/var/lib/undercloud.conf'
+                - null
-                dest: '/var/lib/mistral/undercloud.conf'
+                - - source: '/var/lib/undercloud.conf'
-                merge: true
+                    dest: '/var/lib/mistral/undercloud.conf'
-                preserve_properties: true
+                    merge: true
+                    preserve_properties: true
           permissions:
             - path: /var/log/mistral
               owner: mistral:mistral