Merge "Stop Heat WSGI services on docker upgrade"

[apex-tripleo-heat-templates.git] / extraconfig / post_deploy / undercloud_post.yaml

diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index 38a9181..ff1556f 100644 (file)
--- 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