From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 6 Aug 2015 17:13:07 +0000 (+0000)
Subject: Merge "Drive DB initialization via Hiera"
X-Git-Tag: opnfv-6.0.0~2410
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e96c087509193d5ad63caa3014977a2baf0db0d3;p=apex-tripleo-heat-templates.git

Merge "Drive DB initialization via Hiera"
---

e96c087509193d5ad63caa3014977a2baf0db0d3
diff --cc puppet/controller-puppet.yaml
index 89b35c31,629fe036..291dc6e3
--- a/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}