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 /extraconfig | |
| parent | 5fc8d234dd962b641c4daeae241b98c63f3fa84d (diff) | |
| parent | b26fe7d164eeeef6487628208c0ad0f16332331c (diff) | |
Merge "Use the make_url function to build URLs"
Diffstat (limited to 'extraconfig')
| -rw-r--r-- | extraconfig/post_deploy/undercloud_post.yaml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml index 38a9181e..ff1556fd 100644 --- a/extraconfig/post_deploy/undercloud_post.yaml +++ b/extraconfig/post_deploy/undercloud_post.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > Post-deployment for the TripleO undercloud @@ -81,13 +81,13 @@ resources: auth_url: if: - ssl_disabled - - list_join: - - '' - - - 'http://' - - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]} - - ':5000/v2.0' - - list_join: - - '' - - - 'https://' - - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]} - - ':13000/v2.0' + - make_url: + scheme: http + host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]} + port: 5000 + path: /v2.0 + - make_url: + scheme: https + host: {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]} + port: 13000 + path: /v2.0 |