aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-24 16:06:36 +0000
committerGerrit Code Review <review@openstack.org>2015-07-24 16:06:36 +0000
commit1a0f4eefc8d590ee9da6612b34a018d5055397bd (patch)
tree79b961880f06b1aae86c9be79c1e4dc44f753889 /puppet
parentd982240bde03ca8624f94dbc46ff772f48fa255a (diff)
parent6bf17a9d9303962414c210a7baf9f8d605547ab7 (diff)
Merge "Set heat::instance_user to empty string"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml1
-rw-r--r--puppet/hieradata/controller.yaml1
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index f0d2492c..89b35c31 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -978,7 +978,6 @@ resources:
heat::api_cloudwatch::bind_host: {get_input: heat_api_network}
heat::api_cfn::bind_host: {get_input: heat_api_network}
heat::database_connection: {get_input: heat_dsn}
- heat::instance_user: heat-admin
heat::debug: {get_input: debug}
# Keystone
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 7ee4708d..25719709 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -83,6 +83,7 @@ cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterSch
# heat
heat::engine::configure_delegated_roles: false
heat::engine::trusts_delegated_roles: []
+heat::instance_user: ''
# pacemaker
pacemaker::corosync::cluster_name: 'tripleo_cluster'