diff options
| author |   Zane Bitter <zbitter@redhat.com> | 2017-05-05 14:43:11 -0400 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2017-05-05 14:43:11 -0400 |
| commit | b26fe7d164eeeef6487628208c0ad0f16332331c (patch) | |
| tree | 8eadecf22f2d1c729171bd4b3283d357055c4437 /puppet/services/aodh-base.yaml | |
| parent | 574617d007b02f98b2ac9b7e853cf4fd266fe085 (diff) | |
Use the make_url function to build URLs
Change-Id: I2b23d92c85d5ecc889a7ee597b90e930bde9028e
Depends-On: I72f84e737b042ecfaabf5639c6164d46a072b423
Diffstat (limited to 'puppet/services/aodh-base.yaml')
| -rw-r--r-- | puppet/services/aodh-base.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 5b78e28b..e05e7169 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack Aodh service configured with Puppet @@ -61,15 +61,15 @@ outputs: config_settings: aodh_redis_password: {get_param: RedisPassword} aodh::db::database_connection: - list_join: - - '' - - - {get_param: [EndpointMap, MysqlInternal, protocol]} - - '://aodh:' - - {get_param: AodhPassword} - - '@' - - {get_param: [EndpointMap, MysqlInternal, host]} - - '/aodh' - - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + make_url: + scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} + username: aodh + password: {get_param: AodhPassword} + host: {get_param: [EndpointMap, MysqlInternal, host]} + path: /aodh + query: + read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo aodh::debug: {get_param: Debug} aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } aodh::rabbit_userid: {get_param: RabbitUserName} |