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

Move sahara::db data within service template

Change-Id: Ifb87f79e8cd692e6553d03df8394c74f51821e11
---

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 7af1ac23..b8928f7a 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -52,11 +52,3 @@ aodh::db::mysql::dbname: aodh
 aodh::db::mysql::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
-
-
-sahara::db::mysql::user: sahara
-sahara::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-sahara::db::mysql::dbname: sahara
-sahara::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 17ef49fa..f0411a35 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -37,5 +37,11 @@ outputs:
                   - '/sahara'
             sahara::database_connection: *sahara_dsn
             sahara::db::mysql::password: {get_param: SaharaPassword}
+            sahara::db::mysql::user: sahara
+            sahara::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]}
+            sahara::db::mysql::dbname: sahara
+            sahara::db::mysql::allowed_hosts:
+              - '%'
+              - "%{hiera('mysql_bind_host')}"
       step_config: |
         include ::tripleo::profile::base::sahara::engine