diff options
| author |   John Trowbridge <trown@redhat.com> | 2016-06-21 15:34:02 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-21 15:50:34 -0400 |
| commit | d97a76feef2683056459e5ae8d930d06a1a79989 (patch) | |
| tree | 9aae6999c4a4bb693477bbc4447fb36d9f6255a7 /puppet/services | |
| parent | a2614491be1cae82e4b04337184b75644633ce3f (diff) | |
Heat upstream default policy.json works in devstack
It does not however work in TripleO, and the ping test is failing
with master Heat because of this. I tried submitting a revert[1] in
Heat, but they have functional tests, so it is not broken...
The only option left is using puppet-heat to override the broken
default.
[1] https://review.openstack.org/#/c/332206/
Change-Id: I2c674a2e01eeacd17d3158f378be2d6ceeedc309
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' |