diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-06 19:51:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-06 19:51:02 +0000 |
| commit | edc29bc06838c9397b39067de8aaa4d8002469fc (patch) | |
| tree | f28a0204da0bcaa36c1a308d0049b13fb075fd35 /puppet/services/octavia-api.yaml | |
| parent | 5fc8d234dd962b641c4daeae241b98c63f3fa84d (diff) | |
| parent | b26fe7d164eeeef6487628208c0ad0f16332331c (diff) | |
Merge "Use the make_url function to build URLs"
Diffstat (limited to 'puppet/services/octavia-api.yaml')
| -rw-r--r-- | puppet/services/octavia-api.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml index 99212857..682a41b2 100644 --- a/puppet/services/octavia-api.yaml +++ b/puppet/services/octavia-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack Octavia API service. @@ -65,15 +65,15 @@ outputs: - octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } octavia::policy::policies: {get_param: OctaviaApiPolicies} octavia::db::database_connection: - list_join: - - '' - - - {get_param: [EndpointMap, MysqlInternal, protocol]} - - '://octavia:' - - {get_param: OctaviaPassword} - - '@' - - {get_param: [EndpointMap, MysqlInternal, host]} - - '/octavia' - - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + make_url: + scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} + username: octavia + password: {get_param: OctaviaPassword} + host: {get_param: [EndpointMap, MysqlInternal, host]} + path: /octavia + query: + read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} octavia::keystone::authtoken::project_name: 'service' octavia::keystone::authtoken::password: {get_param: OctaviaPassword} |