aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2015-07-07 15:16:28 +1200
committerSteve Baker <sbaker@redhat.com>2015-07-08 21:50:27 +0000
commit6bf17a9d9303962414c210a7baf9f8d605547ab7 (patch)
treee0ed2a8edc31ceef3ec9cf3942c901c8090d6770 /puppet
parentbca9e7fa9f18a436b0840f17454516c8a10f36fd (diff)
Set heat::instance_user to empty string
In the overcloud heat, heat.conf instance_user is set to heat-admin. The consequence of this is that SSHing into heat created guest VMs will require the user 'heat-admin'. I predict that this will result in user confusion as to how to SSH into their VMs since they will be attempting default usernames (centos, cloud-user etc) or the documented heat default user (ec2-user) This change sets it to an empty string so that default usernames are used. This change depends on the puppet-heat fix to allow empty string instance_user: Depends-On: I9e8be0dd50709d271fc81683770c78380724e405 Change-Id: Id14bf3a4ac1b1c95797dae16c674b32a2da230f8
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 5a356bcc..3aeb40ec 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -920,7 +920,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 3de9bd91..77c0e7ec 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -80,6 +80,7 @@ cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterSch
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'