X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fheat-api-cfn.yaml;h=85ad92122146fae32c540fa618ebb61528dc98d6;hb=287fb6350e202c47860f00275ed8af05fea01f82;hp=93632166d3aadf3f12686d5e43dafbc1dfdde1c9;hpb=758eeff854cd40a0e86a584a462bac68715b0548;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 93632166..85ad9212 100644
--- 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
@@ -51,19 +51,18 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
-      step_config: {get_attr: [HeatBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [HeatBase, role_data, step_config]
       service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &heat_api_cfn_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ]
-      puppet_tags: heat_config,file,concat,file_line
-      config_volume: heat
-      config_image:
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
+      puppet_config:
+        config_volume: heat
+        puppet_tags: heat_config,file,concat,file_line
+        step_config: *step_config
+        config_image:
+          list_join:
+            - '/'
+            - [ {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
@@ -75,7 +74,10 @@ outputs:
       docker_config:
         step_4:
           heat_api_cfn:
-            image: *heat_api_cfn_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ]
             net: host
             privileged: false
             restart: always
@@ -88,3 +90,7 @@ outputs:
               - /dev:/dev
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable heat_api_cfn service
+          tags: step2
+          service: name=openstack-heat-api-cfn state=stopped enabled=no