Merge "mistral-executor: bind-mount undercloud.conf when validations are enabled"

docker/services/mistral-executor.yaml

@@ -52,7 +52,13 @@ parameters:
     default: []
     description: List of user-provided additional volumes to mount into the mistral-executor container
     type: comma_delimited_list
+  UndercloudConfigFilePath:
+    default: ''
+    description: Configuration file for Undercloud, needed by TripleO Validations.
+    type: string
 
+conditions:
+  undercloud_config_file_path_unset: {equals : [{get_param: UndercloudConfigFilePath}, '']}
 
 resources:
 
@@ -80,6 +86,12 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
+          # Note: the hiera parameter will only work if the TripleO validations
+          # are run from Mistral Executor container. If the parameter is
+          # needed on the host, it'll have to be defined somewhere else too.
+          # The hiera param is set to the same value as the bind mound location
+          # of the file inside the container.
+          - tripleo_undercloud_conf_file:  '/var/lib/mistral/undercloud.conf'
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -141,6 +153,14 @@ outputs:
                   - /usr/share/openstack-tripleo-heat-templates:/usr/share/openstack-tripleo-heat-templates:ro
                 - {get_param: MistralExecutorVolumes}
                 - {get_param: MistralExecutorExtraVolumes}
+                - if:
+                  - undercloud_config_file_path_unset
+                  - null
+                  - - list_join:
+                        - ':'
+                        - - {get_param: UndercloudConfigFilePath}
+                          - '/var/lib/mistral/undercloud.conf'
+                          - 'ro'
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: