diff options
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 |
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', |