Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "upgrades/validation: only run validation when services exist"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
heat-api.yaml
diff --git
a/puppet/services/heat-api.yaml
b/puppet/services/heat-api.yaml
index
7eb4739
..
2464011
100644
(file)
--- a/
puppet/services/heat-api.yaml
+++ b/
puppet/services/heat-api.yaml
@@
-85,9
+85,16
@@
outputs:
heat::keystone::auth::password: {get_param: HeatPassword}
heat::keystone::auth::region: {get_param: KeystoneRegion}
upgrade_tasks:
heat::keystone::auth::password: {get_param: HeatPassword}
heat::keystone::auth::region: {get_param: KeystoneRegion}
upgrade_tasks:
+ - name: Check is heat_api is deployed
+ command: systemctl is-enabled openstack-heat-api
+ tags: common
+ ignore_errors: True
+ register: heat_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-heat-api is running"
shell: /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
- name: "PreUpgrade step0,validation: Check service openstack-heat-api is running"
shell: /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
+ when: heat_api_enabled.rc == 0
tags: step0,validation
- name: Stop heat_api service
tags: step1
tags: step0,validation
- name: Stop heat_api service
tags: step1
+ when: heat_api_enabled.rc == 0
service: name=openstack-heat-api state=stopped
service: name=openstack-heat-api state=stopped