diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-09-29 10:12:44 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-09-29 10:12:44 +0000 |
commit | 22decf4276c56b58b41ab6523c9a8da41ddeeab6 (patch) | |
tree | ce122d549bf0593b5b0c8ca6b7eeaf1ead311e76 /puppet/services/cinder-base.yaml | |
parent | 1b634c21c118a54071abd2bc5181453f3aa8d7a7 (diff) | |
parent | 7ba552520787860c966900c8c1fd46e2aefd046c (diff) |
Merge "Move db::mysql into service_config_settings"
Diffstat (limited to 'puppet/services/cinder-base.yaml')
-rw-r--r-- | puppet/services/cinder-base.yaml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index 0db17189..93ab1d79 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -60,18 +60,11 @@ outputs: - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - '/cinder' - cinder::db::mysql::password: {get_param: CinderPassword} cinder::debug: {get_param: Debug} cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL} 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_nobrackets]} - cinder::db::mysql::dbname: cinder - cinder::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" cinder::rabbit_heartbeat_timeout_threshold: 60 cinder::host: hostgroup cinder::cron::db_purge::destination: '/dev/null' |