From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 24 Jul 2015 16:06:36 +0000 (+0000)
Subject: Merge "Set heat::instance_user to empty string"
X-Git-Tag: opnfv-6.0.0~2417
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1a0f4eefc8d590ee9da6612b34a018d5055397bd;p=apex-tripleo-heat-templates.git

Merge "Set heat::instance_user to empty string"
---

1a0f4eefc8d590ee9da6612b34a018d5055397bd
diff --cc puppet/hieradata/controller.yaml
index 7ee4708d,77c0e7ec..25719709
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -81,8 -77,10 +81,9 @@@ nova::config::nova_config
  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: []
+ heat::instance_user: ''
  
  # pacemaker
  pacemaker::corosync::cluster_name: 'tripleo_cluster'