openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set heat::instance_user to empty string"

This commit is contained in:
Jenkins 2015-07-24 16:06:36 +00:00 committed by Gerrit Code Review
parent d982240bde 6bf17a9d93
commit 1a0f4eefc8
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/controller-puppet.yaml
View File

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

1
puppet/hieradata/controller.yaml
View File

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