Merge "SSH known_hosts config"

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

diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 2a27efb..e122647 100644 (file)
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-heat-api-cfn:latest'
     type: string
   # we configure all heat services in the same heat engine container
-  DockerHeatEngineImage:
+  DockerHeatConfigImage:
     description: image
     default: 'centos-binary-heat-engine:latest'
     type: string
@@ -62,15 +62,10 @@ outputs:
         config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/heat_api_cfn.json:
-           command: /usr/bin/heat-api-cfn --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
-           config_files:
-           - dest: /etc/heat/heat.conf
-             owner: heat
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/heat/heat.conf
+        /var/lib/kolla/config_files/heat_api_cfn.json:
+          command: /usr/bin/heat-api-cfn --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
       docker_config:
         step_4:
           heat_api_cfn:
@@ -82,12 +77,12 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/heat/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /dev:/dev
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: