aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-11 10:33:22 +0000
committerGerrit Code Review <review@openstack.org>2016-07-11 10:33:22 +0000
commit2b2c1ded0b30907194d3e497a9654bbd40f2adba (patch)
tree441e62ea1d82d9a6184decfa8f802c6f1336c004 /puppet/services
parentbb32bce09724ae763bc6e335b34757ae6b77a11e (diff)
parentbbe72038e21a2722c194f27f9b98be0649390519 (diff)
Merge "Move cinder::db data within service template"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/cinder-base.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index 85682448..f6d2b645 100644
--- 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')}"