X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fcinder-volume.yaml;h=b52955ef8223af78d4cdf81a379d0455700f4d84;hb=6c24b0a159ca0ca8f76e0dffe13430c7c9f8cb5c;hp=3a06afb8e5e1294ab615c7fb5ba0da2154fd30eb;hpb=fab8f5226376c62848fb73df8eddea398ef63be1;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 3a06afb8..b52955ef 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -116,9 +116,16 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::cinder::volume
       upgrade_tasks:
+        - name: Check if cinder_volume is deployed
+          command: systemctl is-enabled openstack-cinder-volume
+          tags: common
+          ignore_errors: True
+          register: cinder_volume_enabled
         - name: "PreUpgrade step0,validation: Check service openstack-cinder-volume is running"
           shell: /usr/bin/systemctl show 'openstack-cinder-volume' --property ActiveState | grep '\bactive\b'
+          when: cinder_volume_enabled.rc == 0
           tags: step0,validation
         - name: Stop cinder_volume service
-          tags: step2
+          tags: step1
+          when: cinder_volume_enabled.rc == 0
           service: name=openstack-cinder-volume state=stopped