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/glance-api.yaml | |
| parent | 574617d007b02f98b2ac9b7e853cf4fd266fe085 (diff) | |
Use the make_url function to build URLs
Change-Id: I2b23d92c85d5ecc889a7ee597b90e930bde9028e
Depends-On: I72f84e737b042ecfaabf5639c6164d46a072b423
Diffstat (limited to 'puppet/services/glance-api.yaml')
| -rw-r--r-- | puppet/services/glance-api.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index de41c0e8..c89bbaf1 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack Glance API service configured with Puppet @@ -144,15 +144,15 @@ outputs: map_merge: - get_attr: [TLSProxyBase, role_data, config_settings] - glance::api::database_connection: - list_join: - - '' - - - {get_param: [EndpointMap, MysqlInternal, protocol]} - - '://glance:' - - {get_param: GlancePassword} - - '@' - - {get_param: [EndpointMap, MysqlInternal, host]} - - '/glance' - - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + make_url: + scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} + username: glance + password: {get_param: GlancePassword} + host: {get_param: [EndpointMap, MysqlInternal, host]} + path: /glance + query: + read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]} glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } |