diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-04 20:14:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-04 20:14:53 +0000 |
commit | 1d46899bef2b9f2453044cbc9c9ac8cdd72468ee (patch) | |
tree | 8b1ee28645a046da266e350d0d88a35f75eac15e /puppet/services/barbican-api.yaml | |
parent | 58251b518c4d4f3145bccd28d7ed594ed1b61a81 (diff) | |
parent | fe975e8626b27817842eea0e4babbb7d72a919bf (diff) |
Merge "Use list_concat in place of yaql" into stable/pike
Diffstat (limited to 'puppet/services/barbican-api.yaml')
-rw-r--r-- | puppet/services/barbican-api.yaml | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index a894dbdf..974c2538 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -186,22 +186,19 @@ outputs: metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - 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 + list_concat: + - get_attr: [ApacheServiceBase, role_data, 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 |