diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-22 15:35:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-22 15:35:25 +0000 |
| commit | 203e9256f4a26696589a78f449765550960987fa (patch) | |
| tree | 731caf50fcc2ebbf328d693743e752e702baf9f1 /puppet/services | |
| parent | e86786211ad32fa8c17f5a40297d6133d7764da0 (diff) | |
| parent | d97a76feef2683056459e5ae8d930d06a1a79989 (diff) | |
Merge "Heat upstream default policy.json works in devstack"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/heat-base.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 8617df27..88e27945 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -38,3 +38,9 @@ outputs: heat::rabbit_port: {get_param: RabbitClientPort} heat::debug: {get_param: Debug} heat::enable_proxy_headers_parsing: true + # We need this because the default heat policy.json no longer works on TripleO + # https://git.openstack.org/cgit/openstack/heat/commit/?id=ac86702172ddf01f5bdc3f3cd99d2e32ad9b7024 + heat::policy::policies: + context_is_admin: + key: 'context_is_admin' + value: 'role:admin' |