aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/cinder-volume.yaml
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-27 13:04:08 -0500
committerEmilien Macchi <emilien@redhat.com>2017-03-02 12:16:20 +0000
commit53225d57b1c4e3de722f9cdc25eefa9a3dec1e97 (patch)
tree3fd6b9776e3ac76b3eea744c1b0f276f6ef3d0e0 /puppet/services/cinder-volume.yaml
parent74a99e72828c2bda46c856fc4983ad1ae1a4472f (diff)
upgrades/validation: only run validation when services exist
During upgrades, validation test if a service is running before the upgrade process starts. In some cases, servies doesn't exist yet so we don't want to run the validation. This patch makes sure we check if the service is actually present on the system before validating it's running correctly. Also it makes sure that services are enabled before trying to stop them. It allows use-cases where we want to add new services during an upgrade. Also install new packages of services added in Ocata, so we can validate upgrades on scenarios jobs. Change-Id: Ib48fb6b1557be43956557cbde4cbe26b53a50bd8 (cherry picked from commit 7c84a9b390c469e716e5802eef078d2df3902c6a)
Diffstat (limited to 'puppet/services/cinder-volume.yaml')
-rw-r--r--puppet/services/cinder-volume.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 74efaade..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: step1
+ when: cinder_volume_enabled.rc == 0
service: name=openstack-cinder-volume state=stopped