From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 29 Jun 2016 10:58:11 +0000 (+0200)
Subject: Move heat::db data within service template
X-Git-Tag: opnfv-6.0.0~1864^2~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=43cd92aa0abb9d7b3e9e771f0dec5775080a6d43;p=apex-tripleo-heat-templates.git

Move heat::db data within service template

Change-Id: I3fada6c5b0265bc6536c89da0ef4b709ead13b7d
---

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 471e597f..7af1ac23 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -21,14 +21,6 @@ neutron::db::mysql::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
 
-# Heat
-heat::db::mysql::user: heat
-heat::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-heat::db::mysql::dbname: heat
-heat::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
 # Ironic
 ironic::db::mysql::user: ironic
 ironic::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 4a5ec2c0..77af55ef 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -54,5 +54,11 @@ outputs:
             heat::keystone_password: {get_param: HeatPassword}
             heat::db::mysql::password: {get_param: HeatPassword}
             heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
+            heat::db::mysql::user: heat
+            heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+            heat::db::mysql::dbname: heat
+            heat::db::mysql::allowed_hosts:
+              - '%'
+              - "%{hiera('mysql_bind_host')}"
       step_config: |
         include ::tripleo::profile::base::heat::engine