diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-02 09:49:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-02 09:49:37 +0000 |
| commit | 6c24b0a159ca0ca8f76e0dffe13430c7c9f8cb5c (patch) | |
| tree | 586aefab98b0fc462f8c6c8499e0fca2cef48206 /puppet/services/cinder-api.yaml | |
| parent | 09794f09aaaa6d4ab10cb7bbb7ee1f69b63fc09d (diff) | |
| parent | 7c84a9b390c469e716e5802eef078d2df3902c6a (diff) | |
Merge "upgrades/validation: only run validation when services exist"
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 |