X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fheat-engine.yaml;h=c60a3840437c0e6b7241a19379439d00ca58fbf4;hb=fb748ba307684bd71ceaa0765a22389f9385ae88;hp=db8c2be5af829e1555b874e698069272d603df6b;hpb=547eb9e860a61268b4ab0a16bac167b4ace87f89;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index db8c2be5..c60a3840 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -46,16 +46,19 @@ 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_engine_image
         list_join:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
-      puppet_tags: heat_config,file,concat,file_line
-      config_volume: heat
-      config_image: *heat_engine_image
+      puppet_config:
+        config_volume: heat
+        puppet_tags: heat_config,file,concat,file_line
+        step_config: *step_config
+        config_image: *heat_engine_image
       kolla_config:
          /var/lib/kolla/config_files/heat_engine.json:
            command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
@@ -90,3 +93,7 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable heat_engine service
+          tags: step2
+          service: name=openstack-heat-engine state=stopped enabled=no