diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 0f382d8e4e..a9bd63d4e1 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -253,6 +253,9 @@ outputs:
               shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
               register: cinder_api_apache
               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"
               shell: systemctl is-active --quiet openstack-cinder-api
               when: cinder_api_enabled|bool
@@ -271,7 +274,7 @@ outputs:
               when: cinder_api_enabled|bool
             - name: Stop and disable cinder_api service
               service: name=httpd state=stopped enabled=no
-              when: cinder_api_apache.rc == 0
+              when: cinder_api_apache|bool
         - when: step|int == 3
           block:
             - name: remove old cinder cron jobs