Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: d982240 6bf17a9)
Merge "Set heat::instance_user to empty string"
authorJenkins <jenkins@review.openstack.org>
Fri, 24 Jul 2015 16:06:36 +0000 (16:06 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 24 Jul 2015 16:06:36 +0000 (16:06 +0000)
1  2 
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history
puppet/hieradata/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/controller-puppet.yaml
Simple merge
diff --cc puppet/hieradata/controller.yaml
index 7ee4708,77c0e7e..2571970
--- 1/puppet/hieradata/controller.yaml
--- 2/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'