diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-02 20:24:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-02 20:24:18 +0000 |
| commit | 5b8cab7cfdec7aa324ed1b57f2795c9eca3baae4 (patch) | |
| tree | 2dec51bb12ecfe9e49c26851767ea2b3235faa26 /puppet/services/cinder-api.yaml | |
| parent | 6eba4325246351b96996e871aeeab56a03590209 (diff) | |
| parent | 53225d57b1c4e3de722f9cdc25eefa9a3dec1e97 (diff) | |
Merge "upgrades/validation: only run validation when services exist" into stable/ocata
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 |