diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-04-26 23:10:24 +0200 |
|---|---|---|
| committer | Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-04-27 08:55:54 +0200 |
| commit | 47078434693aa32b02d8b02877e365d34309e8a6 (patch) | |
| tree | fdc1da37cede33ea909c8f1aa7332e52c7df6bc9 /puppet/services/keystone.yaml | |
| parent | 2e25d117e10ddba126d2e130cd6987e93f591589 (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/keystone.yaml')
| -rw-r--r-- | puppet/services/keystone.yaml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 0b9f10ca..d5dfb64f 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -332,10 +332,15 @@ outputs: horizon::keystone_multidomain_support: true horizon::keystone_default_domain: 'Default' - {} - # Ansible tasks to handle upgrade - upgrade_tasks: - - name: Stop keystone service (running under httpd) - tags: step1 - service: name=httpd state=stopped metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] + upgrade_tasks: + yaql: + expression: $.data.apache_upgrade + $.data.keystone_upgrade + data: + apache_upgrade: + get_attr: [ApacheServiceBase, role_data, upgrade_tasks] + keystone_upgrade: + - name: Stop keystone service (running under httpd) + tags: step1 + service: name=httpd state=stopped |