X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Fnet_vip_map_external.yaml;h=58f96e6576b8e6c8899e20946f7943a252f16d49;hb=3de1aa200acf97914bf0bbbe977c3ddd0bd7a734;hp=a40a0bfc879088dc78d76abae71f7a6722ac82cc;hpb=00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/net_vip_map_external.yaml b/network/ports/net_vip_map_external.yaml
index a40a0bfc..58f96e65 100644
--- 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: ocata
 
 parameters:
   # Set these via parameter defaults to configure external VIPs
@@ -45,12 +45,6 @@ parameters:
   StorageMgmtIpUri:
     default: ''
     type: string
-  TenantIp:
-    default: ''
-    type: string
-  TenantIpUri:
-    default: ''
-    type: string
 
 outputs:
   net_ip_map:
@@ -63,13 +57,8 @@ 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: {get_param: ExternalNetworkVip}
-      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}