openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add heat service support for composable upgrades"

This commit is contained in:
Jenkins 2017-01-16 15:54:07 +00:00 committed by Gerrit Code Review
parent 0080df3f42 399a048017
commit 6ab1c9289d
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/services/heat-api-cfn.yaml
View File

@ -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

7
puppet/services/heat-api-cloudwatch.yaml
View File

@ -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

7
puppet/services/heat-api.yaml
View File

@ -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

10
puppet/services/heat-engine.yaml
View File

@ -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