Move cinder::db data within service template

Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index a100ae3..471e597 100644 (file)
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -21,14 +21,6 @@ neutron::db::mysql::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
 
-# Cinder
-cinder::db::mysql::user: cinder
-cinder::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-cinder::db::mysql::dbname: cinder
-cinder::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
 # Heat
 heat::db::mysql::user: heat
 heat::db::mysql::host: "%{hiera('mysql_virtual_ip')}"

diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index 8568244..f6d2b64 100644 (file)
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -56,3 +56,9 @@ outputs:
         cinder::rabbit_userid: {get_param: RabbitUserName}
         cinder::rabbit_password: {get_param: RabbitPassword}
         cinder::rabbit_port: {get_param: RabbitClientPort}
+        cinder::db::mysql::user: cinder
+        cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+        cinder::db::mysql::dbname: cinder
+        cinder::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"