From aabde9a45015abebc7b29b9ca0cd2f76b5797a48 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 29 Jun 2016 12:52:09 +0200
Subject: [PATCH] Move keystone::db data within service template

Change-Id: I934aff4960588a3957b7a7bcc90385ae48d34d1e
---
 puppet/hieradata/database.yaml | 8 --------
 puppet/services/keystone.yaml  | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 9cbff58659..d59afb4122 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -21,14 +21,6 @@ glance::db::mysql::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
 
-# Keystone
-keystone::db::mysql::user: keystone
-keystone::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-keystone::db::mysql::dbname: keystone
-keystone::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
 # Neutron
 neutron::db::mysql::user: neutron
 neutron::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 25d92d4acc..0ad6025c40 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -128,5 +128,12 @@ outputs:
         keystone::public_workers: {get_param: KeystoneWorkers}
         keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
         keystone::public_endpoint: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
+        keystone::db::mysql::user: keystone
+        keystone::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        keystone::db::mysql::dbname: keystone
+        keystone::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"
+
       step_config: |
         include ::tripleo::profile::base::keystone