openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix cinder_api_apache error during upgrade."

Browse Source
This commit is contained in:
Zuul 2018-10-22 21:31:10 +00:00 committed by Gerrit Code Review
commit 5862e1cd74
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/cinder-api.yaml
View File

@ -253,6 +253,9 @@ outputs:
shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder" shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
register: cinder_api_apache register: cinder_api_apache
ignore_errors: true ignore_errors: true
- name: Set fact cinder_api_apache (upgrade)
set_fact:
cinder_api_apache: "{{ cinder_api_apache.rc == 0 }}"
- name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running" - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
shell: systemctl is-active --quiet openstack-cinder-api shell: systemctl is-active --quiet openstack-cinder-api
when: cinder_api_enabled|bool when: cinder_api_enabled|bool
@ -271,7 +274,7 @@ outputs:
when: cinder_api_enabled|bool when: cinder_api_enabled|bool
- name: Stop and disable cinder_api service - name: Stop and disable cinder_api service
service: name=httpd state=stopped enabled=no service: name=httpd state=stopped enabled=no
when: cinder_api_apache.rc == 0 when: cinder_api_apache|bool
- when: step|int == 3 - when: step|int == 3
block: block:
- name: remove old cinder cron jobs - name: remove old cinder cron jobs