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/panko-api.yaml | |
parent | 0b8fa1c7fecf0a95029a25a1e38218e55f085db6 (diff) | |
parent | 47078434693aa32b02d8b02877e365d34309e8a6 (diff) |
Merge "upgrades: deploy mod_ssl when upgrading apache" into stable/ocata
Diffstat (limited to 'puppet/services/panko-api.yaml')
-rw-r--r-- | puppet/services/panko-api.yaml | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index eed98257..a9635d28 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -85,21 +85,27 @@ outputs: metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - - name: Check if httpd is deployed - command: systemctl is-enabled httpd - tags: common - ignore_errors: True - register: httpd_enabled - - name: "PreUpgrade step0,validation: Check if httpd is running" - shell: > - /usr/bin/systemctl show 'httpd' --property ActiveState | - grep '\bactive\b' - when: httpd_enabled.rc == 0 - tags: step0,validation - - name: Stop panko-api service (running under httpd) - tags: step1 - service: name=httpd state=stopped - when: httpd_enabled.rc == 0 - - name: Install openstack-panko-api package if it was not installed - tags: step3 - yum: name=openstack-panko-api state=latest + yaql: + expression: $.data.apache_upgrade + $.data.panko_api_upgrade + data: + apache_upgrade: + get_attr: [ApacheServiceBase, role_data, upgrade_tasks] + panko_api_upgrade: + - name: Check if httpd is deployed + command: systemctl is-enabled httpd + tags: common + ignore_errors: True + register: httpd_enabled + - name: "PreUpgrade step0,validation: Check if httpd is running" + shell: > + /usr/bin/systemctl show 'httpd' --property ActiveState | + grep '\bactive\b' + when: httpd_enabled.rc == 0 + tags: step0,validation + - name: Stop panko-api service (running under httpd) + tags: step1 + service: name=httpd state=stopped + when: httpd_enabled.rc == 0 + - name: Install openstack-panko-api package if it was not installed + tags: step3 + yum: name=openstack-panko-api state=latest |