Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "upgrades/validation: only run validation when services exist"
[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
3a06afb
..
b52955e
100644
(file)
--- 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:
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'
- 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: step0,validation
- name: Stop cinder_volume service
- tags: step2
+ tags: step1
+ when: cinder_volume_enabled.rc == 0
service: name=openstack-cinder-volume state=stopped
service: name=openstack-cinder-volume state=stopped