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/keystone.yaml | |
| parent | 0b8fa1c7fecf0a95029a25a1e38218e55f085db6 (diff) | |
| parent | 47078434693aa32b02d8b02877e365d34309e8a6 (diff) | |
Merge "upgrades: deploy mod_ssl when upgrading apache" into stable/ocata
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 |