summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2015-07-07 12:51:28 -0500
committerBen Nemec <bnemec@redhat.com>2015-07-07 12:51:28 -0500
commitfa782c157cc0ce997e1957412e8f55b018519df7 (patch)
treeffb4c550f1138f39934df0ac8b4186be29ecad08 /puppet
parent1a1a2fb3521342efb85d499dde999073734fc015 (diff)
Don't set heat_stack_user_role to empty string
This value doesn't work, and the default of heat_stack_user is fine. See https://github.com/openstack/puppet-heat/blob/989ffa65f4339bfd9612cff3b5ddcc4fd301f695/manifests/engine.pp#L22 Resolves: rhbz#1238844 Change-Id: I247121cb91d2b2a34f0f9f769fb411fcbfe6b571
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index eb45ee13..cdd1d3ae 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -77,7 +77,6 @@ nova::api::osapi_v3: true
cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
# heat
-heat::engine::heat_stack_user_role: ''
heat::engine::configure_delegated_roles: false
heat::engine::trusts_delegated_roles: []
@@ -112,4 +111,4 @@ tripleo::loadbalancer::heat_cloudwatch: true
tripleo::loadbalancer::heat_cfn: true
tripleo::loadbalancer::horizon: true
-controller_classes: [] \ No newline at end of file
+controller_classes: []