aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--puppet/services/heat-base.yaml6
2 files changed, 8 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 302ef415..3a4f05fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,10 @@ group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 1.1'
- gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-trailing_newline-check'
+ # https://github.com/voxpupuli/puppet-lint-absolute_classname-check/issues/6
+ gem 'puppet-lint-absolute_classname-check', '0.1.3', :require => 'false'
# Puppet 4.x related lint checks
gem 'puppet-lint-unquoted_string-check'
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'