X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Fnet_vip_map_external_v6.yaml;h=72e60cb258c42f9af6fd37c876417cd214125c56;hb=b41d110b3abda980c422d4f3f8fb6c1fc958eec8;hp=f6d67fe8ccd073bde7ca9b1c6728c82e39d8665a;hpb=31ffe53d75dd81a9ff083224f0ae7d509ae77f96;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/net_vip_map_external_v6.yaml b/network/ports/net_vip_map_external_v6.yaml
index f6d67fe8..72e60cb2 100644
--- a/network/ports/net_vip_map_external_v6.yaml
+++ b/network/ports/net_vip_map_external_v6.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 parameters:
   # Set these via parameter defaults to configure external VIPs
@@ -27,30 +27,28 @@ parameters:
   ExternalIpUri:
     default: ''
     type: string
+    description: IP address with brackets in case of IPv6
   InternalApiIp:
     default: ''
     type: string
   InternalApiIpUri:
     default: ''
     type: string
+    description: IP address with brackets in case of IPv6
   StorageIp:
     default: ''
     type: string
   StorageIpUri:
     default: ''
     type: string
+    description: IP address with brackets in case of IPv6
   StorageMgmtIp:
     default: ''
     type: string
   StorageMgmtIpUri:
     default: ''
     type: string
-  TenantIp:
-    default: ''
-    type: string
-  TenantIpUri:
-    default: ''
-    type: string
+    description: IP address with brackets in case of IPv6
 
 outputs:
   net_ip_map:
@@ -63,31 +61,26 @@ outputs:
       internal_api: {get_param: InternalApiNetworkVip}
       storage: {get_param: StorageNetworkVip}
       storage_mgmt: {get_param: StorageMgmtNetworkVip}
-  net_ip_uri_map:
-    description: >
-      A Hash containing a mapping of netowrk names to assigned IPs for a
-      specific machine with brackets around IPv6 addresses for use in URLs.
-    value:
-      ctlplane: {get_param: ControlPlaneIP}
-      external:
+      ctlplane_uri: {get_param: ControlPlaneIP}
+      external_uri:
         list_join:
           - ''
           - - '['
             - {get_param: ExternalNetworkVip}
             - ']'
-      internal_api:
+      internal_api_uri:
         list_join:
           - ''
           - - '['
             - {get_param: InternalApiNetworkVip}
             - ']'
-      storage:
+      storage_uri:
         list_join:
           - ''
           - - '['
             - {get_param: StorageNetworkVip}
             - ']'
-      storage_mgmt:
+      storage_mgmt_uri:
         list_join:
           - ''
           - - '['