aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-03-06 22:09:05 -0500
committerDan Prince <dprince@redhat.com>2015-03-06 22:09:05 -0500
commit67fc92c5e4202362bd40db620ad5d4649f79f8dd (patch)
tree871698dd8114ad19fe6736993ad3388163ceeb92
parent44a22fc61e24c2efc221edd7085c8f4d44b39fc0 (diff)
puppet: set heat-user using class parameter
The puppet-heat module just added a new class parameter to help manage instance_user today in I44fef59d3ed1f7851d8504855a7ae0d5460fdc84. This actually broke us because we were setting it manually via heat_config (puppet doesn't allow two settings). Change-Id: Ib25e8de8ca3849701d506a5d0c956a6f3317ac8a Closes-bug: #1429328
-rw-r--r--puppet/controller-puppet.yaml1
-rw-r--r--puppet/manifests/overcloud_controller.pp4
2 files changed, 1 insertions, 4 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 18c585d7..fe03fbf6 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -632,6 +632,7 @@ resources:
heat::api_cloudwatch::bind_host: {get_input: controller_host}
heat::api_cfn::bind_host: {get_input: controller_host}
heat::database_connection: {get_input: heat_dsn}
+ heat::instance_user: heat-admin
# Keystone
keystone::admin_token: {get_input: admin_token}
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 23e8adf0..d4faf340 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -312,10 +312,6 @@ if hiera('step') >= 2 {
include ::heat::api_cloudwatch
include ::heat::engine
- heat_config {
- 'DEFAULT/instance_user': value => 'heat-admin';
- }
-
$snmpd_user = hiera('snmpd_readonly_user_name')
snmp::snmpv3_user { $snmpd_user:
authtype => 'MD5',