diff options
author | Emilien Macchi <emilien@redhat.com> | 2017-02-27 13:04:08 -0500 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2017-03-01 19:49:00 +0000 |
commit | 7c84a9b390c469e716e5802eef078d2df3902c6a (patch) | |
tree | 329861c5c0f3a8e1b04f12c7cdb7d7b7fe37ce72 /puppet/services/cinder-api.yaml | |
parent | b889a4b5b3be37ee1dabb60ddce519af84b15b22 (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
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r-- | puppet/services/cinder-api.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
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 |