aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/aodh-api.yaml
diff options
context:
space:
mode:
authorSofer Athlan-Guyot <sathlang@redhat.com>2017-04-26 23:10:24 +0200
committerSofer Athlan-Guyot <sathlang@redhat.com>2017-04-27 08:55:54 +0200
commit47078434693aa32b02d8b02877e365d34309e8a6 (patch)
treefdc1da37cede33ea909c8f1aa7332e52c7df6bc9 /puppet/services/aodh-api.yaml
parent2e25d117e10ddba126d2e130cd6987e93f591589 (diff)
upgrades: deploy mod_ssl when upgrading apache
1) When Apache is upgraded, install mod_ssl rpm. See https://bugs.launchpad.net/tripleo/+bug/1682448 to understand why we need mod_ssl. 2) All services that run Apache for API will use the snippet from Apache service to deploy mod_ssl, so we don't duplicate the code in all services. It's using the same mechanism as ovs upgrade to compile upgrade_tasks between both services. Change-Id: Ia2f6fea45c2c09790c49baab19b1efcab25e9a84 Closes-Bug: #1686503 (cherry picked from commit a6041608ca68aad4298ed9e8febafc442a250a55)
Diffstat (limited to 'puppet/services/aodh-api.yaml')
-rw-r--r--puppet/services/aodh-api.yaml12
1 files changed, 9 insertions, 3 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index d7c87b61..ee5c0fdd 100644
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -86,6 +86,12 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
- - name: Stop aodh_api service (running under httpd)
- tags: step1
- service: name=httpd state=stopped
+ yaql:
+ expression: $.data.apache_upgrade + $.data.aodh_api_upgrade
+ data:
+ apache_upgrade:
+ get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
+ aodh_api_upgrade:
+ - name: Stop aodh_api service (running under httpd)
+ tags: step1
+ service: name=httpd state=stopped