Merge "Copy undercloud.conf file during mistral-executor start up."

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

@@ -138,6 +138,13 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - if:
+              - undercloud_config_file_path_unset
+              - ''
+              - source: '/var/lib/undercloud.conf'
+                dest: '/var/lib/mistral/undercloud.conf'
+                merge: true
+                preserve_properties: true
           permissions:
             - path: /var/log/mistral
               owner: mistral:mistral
@@ -183,7 +190,7 @@ outputs:
                   - - list_join:
                         - ':'
                         - - {get_param: UndercloudConfigFilePath}
-                          - '/var/lib/mistral/undercloud.conf'
+                          - '/var/lib/undercloud.conf'
                           - 'ro'
                 - - str_replace:
                       template: