Merge "Drive DB initialization via Hiera"

diff --cc puppet/controller-puppet.yaml
index 89b35c3,629fe03..291dc6e
--- 1/puppet/controller-puppet.yaml
--- 2/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@@ -978,7 -955,9 +984,8 @@@ 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}
+                 heat::db::mysql::password: {get_input: heat_password}
  
                  # Keystone
                  keystone::admin_token: {get_input: admin_token}

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge