Make many networking parameters consistent

[apex-tripleo-heat-templates.git] / network / ports / net_vip_map_external.yaml

diff --git a/network/ports/net_vip_map_external.yaml b/network/ports/net_vip_map_external.yaml
index 23e1f99..d084788 100644 (file)
--- a/network/ports/net_vip_map_external.yaml
+++ b/network/ports/net_vip_map_external.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
@@ -24,18 +24,31 @@ parameters:
   ExternalIp:
     default: ''
     type: string
+  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
-  TenantIp:
+  StorageMgmtIpUri:
     default: ''
     type: string
+    description: IP address with brackets in case of IPv6
 
 outputs:
   net_ip_map:
@@ -48,3 +61,8 @@ outputs:
       internal_api: {get_param: InternalApiNetworkVip}
       storage: {get_param: StorageNetworkVip}
       storage_mgmt: {get_param: StorageMgmtNetworkVip}
+      ctlplane_uri: {get_param: ControlPlaneIP}
+      external_uri: {get_param: ExternalNetworkVip}
+      internal_api_uri: {get_param: InternalApiNetworkVip}
+      storage_uri: {get_param: StorageNetworkVip}
+      storage_mgmt_uri: {get_param: StorageMgmtNetworkVip}