aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/panko-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-27 20:21:18 +0000
committerGerrit Code Review <review@openstack.org>2017-04-27 20:21:18 +0000
commit1b8774331a3d50b8f49b99d3bdef9e1efcba6ea1 (patch)
tree78540f878084a14e06395ddb41f86c2523d3a97e /puppet/services/panko-api.yaml
parentd3f842ecd01db3f833e14a5377e9c31ed6801838 (diff)
parenta6041608ca68aad4298ed9e8febafc442a250a55 (diff)
Merge "upgrades: deploy mod_ssl when upgrading apache"
Diffstat (limited to 'puppet/services/panko-api.yaml')
-rw-r--r--puppet/services/panko-api.yaml42
1 files changed, 24 insertions, 18 deletions
diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml
index 43e7aa18..63cddb04 100644
--- a/puppet/services/panko-api.yaml
+++ b/puppet/services/panko-api.yaml
@@ -92,21 +92,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