Merge "Introduce role-specific NodeUserData, use for docker"

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

diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 1ed7452..fcf2eee 100644 (file)
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -101,34 +101,3 @@ outputs:
       storage_mgmt_uri: {get_param: StorageMgmtIpUri}
       tenant_uri: {get_param: TenantIpUri}
       management_uri: {get_param: ManagementIpUri}
-  # net_ip_subnet_map is deprecated, please use *subnet from net_ip_map
-  net_ip_subnet_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs/CIDR
-      for a specific machine.
-    value:
-      ctlplane:
-        list_join:
-          - ''
-          - - {get_param: ControlPlaneIp}
-            - '/'
-            - {get_param: ControlPlaneSubnetCidr}
-      external: {get_param: ExternalIpSubnet}
-      internal_api: {get_param: InternalApiIpSubnet}
-      storage: {get_param: StorageIpSubnet}
-      storage_mgmt: {get_param: StorageMgmtIpSubnet}
-      tenant: {get_param: TenantIpSubnet}
-      management: {get_param: ManagementIpSubnet}
-  # 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}