diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-28 09:21:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-28 09:21:14 +0000 |
| commit | 8df67f413dbf309724d03478bed8c2e2c62dec87 (patch) | |
| tree | 6afe5b32c4b6d2136d48dcce7fa468bb0b61ef8e /puppet/services/barbican-api.yaml | |
| parent | 0b8fa1c7fecf0a95029a25a1e38218e55f085db6 (diff) | |
| parent | 47078434693aa32b02d8b02877e365d34309e8a6 (diff) | |
Merge "upgrades: deploy mod_ssl when upgrading apache" into stable/ocata
Diffstat (limited to 'puppet/services/barbican-api.yaml')
| -rw-r--r-- | puppet/services/barbican-api.yaml | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index cba92415..72d68e0f 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -146,16 +146,22 @@ outputs: metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - - name: Check if barbican_api is deployed - command: systemctl is-enabled openstack-barbican-api - tags: common - ignore_errors: True - register: barbican_api_enabled - - name: "PreUpgrade step0,validation: Check service openstack-barbican-api is running" - shell: /usr/bin/systemctl show 'openstack-barbican-api' --property ActiveState | grep '\bactive\b' - when: barbican_api_enabled.rc == 0 - tags: step0,validation - - name: Install openstack-barbican-api package if it was disabled - tags: step3 - yum: name=openstack-barbican-api state=latest - when: barbican_api_enabled.rc != 0 + yaql: + expression: $.data.apache_upgrade + $.data.barbican_api_upgrade + data: + apache_upgrade: + get_attr: [ApacheServiceBase, role_data, upgrade_tasks] + barbican_api_upgrade: + - name: Check if barbican_api is deployed + command: systemctl is-enabled openstack-barbican-api + tags: common + ignore_errors: True + register: barbican_api_enabled + - name: "PreUpgrade step0,validation: Check service openstack-barbican-api is running" + shell: /usr/bin/systemctl show 'openstack-barbican-api' --property ActiveState | grep '\bactive\b' + when: barbican_api_enabled.rc == 0 + tags: step0,validation + - name: Install openstack-barbican-api package if it was disabled + tags: step3 + yum: name=openstack-barbican-api state=latest + when: barbican_api_enabled.rc != 0 |