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 /extraconfig/post_deploy | |
| parent | 574617d007b02f98b2ac9b7e853cf4fd266fe085 (diff) | |
Use the make_url function to build URLs
Change-Id: I2b23d92c85d5ecc889a7ee597b90e930bde9028e
Depends-On: I72f84e737b042ecfaabf5639c6164d46a072b423
Diffstat (limited to 'extraconfig/post_deploy')
| -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 |