diff options
author | Ben Nemec <bnemec@redhat.com> | 2016-11-04 14:11:36 -0500 |
---|---|---|
committer | Ben Nemec <bnemec@redhat.com> | 2016-11-04 16:27:08 -0500 |
commit | 16004b9e7e03091dd1295fde193d82a77e68dd02 (patch) | |
tree | 6048dc61064d3715db6aef2338e3735acc6733c2 /puppet/services/manila-base.yaml | |
parent | f20c044c73d33dd031ce3f760a5c6dd0f7bfb3c9 (diff) |
Move db settings from manila-api to manila-base
manila-share also needs the db configuration so the db-sync works
correctly when manila-api is running on a non-controller node.
Change-Id: Ib8a6f10ef6a650275fc011e51acfc4b5c7c99164
Closes-Bug: 1633077
Diffstat (limited to 'puppet/services/manila-base.yaml')
-rw-r--r-- | puppet/services/manila-base.yaml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index d228577a..844bd3a3 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -40,6 +40,10 @@ parameters: default: 5672 description: Set rabbit subscriber port, change this if using SSL type: number + ManilaPassword: + description: The password for the manila service account. + type: string + hidden: true outputs: role_data: @@ -54,3 +58,21 @@ outputs: manila::debug: {get_param: Debug} manila::db::database_db_max_retries: -1 manila::db::database_max_retries: -1 + manila::sql_connection: + list_join: + - '' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://manila:' + - {get_param: ManilaPassword} + - '@' + - {get_param: [EndpointMap, MysqlInternal, host]} + - '/manila' + service_config_settings: + mysql: + manila::db::mysql::password: {get_param: ManilaPassword} + manila::db::mysql::user: manila + manila::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} + manila::db::mysql::dbname: manila + manila::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" |