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/aodh-base.yaml | |
| parent | 1b634c21c118a54071abd2bc5181453f3aa8d7a7 (diff) | |
| parent | 7ba552520787860c966900c8c1fd46e2aefd046c (diff) | |
Merge "Move db::mysql into service_config_settings"
Diffstat (limited to 'puppet/services/aodh-base.yaml')
| -rw-r--r-- | puppet/services/aodh-base.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 5314b837..950e9026 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -87,13 +87,6 @@ outputs: aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } aodh::auth::auth_password: {get_param: AodhPassword} - aodh::db::mysql::user: aodh - aodh::db::mysql::password: {get_param: AodhPassword} - aodh::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - aodh::db::mysql::dbname: aodh - aodh::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" aodh::auth::auth_region: 'regionOne' aodh::auth::auth_tenant_name: 'service' service_config_settings: @@ -104,3 +97,11 @@ outputs: aodh::keystone::auth::password: {get_param: AodhPassword} aodh::keystone::auth::region: {get_param: KeystoneRegion} aodh::keystone::auth::tenant: 'service' + mysql: + aodh::db::mysql::user: aodh + aodh::db::mysql::password: {get_param: AodhPassword} + aodh::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} + aodh::db::mysql::dbname: aodh + aodh::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" |