From 399a0480175952883ec87ddafcea4c383255fecd Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 1 Dec 2016 10:04:09 +0000
Subject: [PATCH] Add heat service support for composable upgrades

Change-Id: Idbbff1e7b3947a8a381ddae172006d724a98a344
Partially-Implements: blueprint overcloud-upgrades-per-service
---
 puppet/services/heat-api-cfn.yaml        |  8 ++++++++
 puppet/services/heat-api-cloudwatch.yaml |  7 +++++++
 puppet/services/heat-api.yaml            |  7 +++++++
 puppet/services/heat-engine.yaml         | 10 ++++++++++
 4 files changed, 32 insertions(+)

diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 10a7780b8d..f4d3cad3c3 100644
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -84,3 +84,11 @@ outputs:
               heat::keystone::auth_cfn::admin_url: {get_param: [EndpointMap, HeatCfnAdmin, uri]}
               heat::keystone::auth_cfn::password: {get_param: HeatPassword}
               heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
+      upgrade_tasks:
+        - name: Stop heat_api_cfn service
+          tags: step2
+          service: name=openstack-heat-api-cfn state=stopped
+        - name: Start heat_api_cfn service
+          tags: step6
+          service: name=openstack-heat-api-cfn state=started
+
diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml
index 1178d62b69..ba4a287acc 100644
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/puppet/services/heat-api-cloudwatch.yaml
@@ -66,3 +66,10 @@ outputs:
             heat::api_cloudwatch::bind_host: {get_param: [ServiceNetMap, HeatApiNetwork]}
       step_config: |
         include ::tripleo::profile::base::heat::api_cloudwatch
+      upgrade_tasks:
+        - name: Stop heat_api_cloudwatch service
+          tags: step2
+          service: name=openstack-heat-api-cloudwatch state=stopped
+        - name: Start heat_api_cloudwatch service
+          tags: step6
+          service: name=openstack-heat-api state=started
diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index a32521c78c..7ec9d6d4f0 100644
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@@ -84,3 +84,10 @@ outputs:
               heat::keystone::auth::admin_url: {get_param: [EndpointMap, HeatAdmin, uri]}
               heat::keystone::auth::password: {get_param: HeatPassword}
               heat::keystone::auth::region: {get_param: KeystoneRegion}
+      upgrade_tasks:
+        - name: Stop heat_api service
+          tags: step2
+          service: name=openstack-heat-api state=stopped
+        - name: Start heat_api service
+          tags: step6
+          service: name=openstack-heat-api state=started
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 8faccd2bc5..6efb065390 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -137,3 +137,13 @@ outputs:
         keystone:
             # This is needed because the keystone profile handles creating the domain
             tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword}
+      upgrade_tasks:
+        - name: Stop heat_engine service
+          tags: step2
+          service: name=openstack-heat-engine state=stopped
+        - name: Sync heat_engine DB
+          tags: step5
+          command: heat-manage --config-file /etc/heat/heat.conf db_sync
+        - name: Start heat_engine service
+          tags: step6
+          service: name=openstack-heat-engine state=started