Merge "Deploy versionless keystone endpoints (for keystone only)" into stable/ocata

[apex-tripleo-heat-templates.git] / puppet / services / cinder-volume.yaml

diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 5299563..b52955e 100644 (file)
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Cinder Volume service configured with Puppet
@@ -115,3 +115,17 @@ outputs:
             tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
       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: step1
+          when: cinder_volume_enabled.rc == 0
+          service: name=openstack-cinder-volume state=stopped