Remove deprecated net_ip_uri_map output

Takes the net_ip_uri_map value from the *_uri values emitted
by net_ip_map instead.

Also removes TenantIp and TenantIpUri from net_vip_map_external
templates as there won't be any VIP on the tenant network.

Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f

1 files changed, 0 insertions, 13 deletions

diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 2b98edcc..fcf2eeee 100644
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -101,16 +101,3 @@ outputs:
       storage_mgmt_uri: {get_param: StorageMgmtIpUri}
       tenant_uri: {get_param: TenantIpUri}
       management_uri: {get_param: ManagementIpUri}
-  # net_ip_uri_map is deprecated, please use *uri from net_ip_map
-  net_ip_uri_map:
-    description: >
-      A Hash containing a mapping of network 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: ExternalIpUri}
-      internal_api: {get_param: InternalApiIpUri}
-      storage: {get_param: StorageIpUri}
-      storage_mgmt: {get_param: StorageMgmtIpUri}
-      tenant: {get_param: TenantIpUri}
-      management: {get_param: ManagementIpUri}