From: Ben Nemec <bnemec@redhat.com>
Date: Tue, 7 Jul 2015 17:51:28 +0000 (-0500)
Subject: Don't set heat_stack_user_role to empty string
X-Git-Tag: opnfv-6.0.0~2449
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fa782c157cc0ce997e1957412e8f55b018519df7;p=apex-tripleo-heat-templates.git

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
---

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: []