X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fcinder-api.yaml;h=c0ea7aaa671d3530739d7423b7a1d3cd568a585b;hb=6c24b0a159ca0ca8f76e0dffe13430c7c9f8cb5c;hp=52c46568f4369f774bde67966c402923dadb4956;hpb=378d831ebf4a160bc470b599e251409fce0b85ef;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 52c46568..c0ea7aaa 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -150,8 +150,14 @@ outputs:
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
+        - name: Check if cinder_api is deployed
+          command: systemctl is-enabled openstack-cinder-api
+          tags: common
+          ignore_errors: True
+          register: cinder_api_enabled
         - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
           shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
+          when: cinder_api_enabled.rc == 0
           tags: step0,validation
         - name: check for cinder running under apache (post upgrade)
           tags: step1
@@ -164,4 +170,5 @@ outputs:
           when: "cinder_apache.rc == 0"
         - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
           tags: step1
+          when: cinder_api_enabled.rc == 0
           service: name=openstack-cinder-api state=stopped enabled=no