openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add upgrade tasks for heat over httpd 

Change-Id: Ia7b8c41d4d8135f58661a74a4298f60abb251fbe
This commit is contained in:
Juan Antonio Osorio Robles 2017-03-06 09:56:43 +02:00 committed by Emilien Macchi
parent e0d9a896af
commit 4b1ea2487e
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,16 @@ outputs:
shell: /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
when: heat_api_cfn_enabled.rc == 0
tags: step0,validation
- name: Stop heat_api_cfn service
- name: check for heat_api_cfn running under apache (post upgrade)
tags: step1
when: heat_api_cfn_enabled.rc == 0
service: name=openstack-heat-api-cfn state=stopped
shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_cfn_wsgi"
register: heat_api_cfn_apache
ignore_errors: true
- name: Stop heat_api_cfn service (running under httpd)
tags: step1
service: name=httpd state=stopped
when: "heat_api_cfn_apache.rc == 0"
- name: Stop and disable heat_api_cfn service (pre-upgrade not under httpd)
tags: step1
when: heat_api_cfn_apache.rc == 0
service: name=openstack-heat-api-cfn state=stopped enabled=no

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

@ -106,7 +106,16 @@ outputs:
shell: /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
when: heat_api_cloudwatch_enabled.rc == 0
tags: step0,validation
- name: Stop heat_api_cloudwatch service
- name: check for heat_api_cloudwatch running under apache (post upgrade)
tags: step1
shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_cloudwatch_wsgi"
register: heat_api_cloudwatch_apache
ignore_errors: true
- name: Stop heat_api_cloudwatch service (running under httpd)
tags: step1
service: name=httpd state=stopped
when: "heat_api_cloudwatch_apache.rc == 0"
- name: Stop and disable heat_api_cloudwatch service (pre-upgrade not under httpd)
tags: step1
when: heat_api_cloudwatch_enabled.rc == 0
service: name=openstack-heat-api-cloudwatch state=stopped
service: name=openstack-heat-api-cloudwatch state=stopped enabled=no

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

@ -122,7 +122,16 @@ outputs:
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
- name: check for heat_api running under apache (post upgrade)
tags: step1
shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_wsgi"
register: heat_api_apache
ignore_errors: true
- name: Stop heat_api service (running under httpd)
tags: step1
service: name=httpd state=stopped
when: "heat_api_apache.rc == 0"
- name: Stop and disable heat_api service (pre-upgrade not under httpd)
tags: step1
when: heat_api_enabled.rc == 0
service: name=openstack-heat-api state=stopped
service: name=openstack-heat-api state=stopped enabled=no