Merge "Render port templates via j2"

1 files changed, 0 insertions, 61 deletions

diff --git a/network/ports/tenant_v6.yaml b/network/ports/tenant_v6.yaml
deleted file mode 100644
index 47d52d8a..00000000
--- a/network/ports/tenant_v6.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Creates a port on the tenant network.
-
-parameters:
-  TenantNetName:
-    description: The name of the tenant network.
-    default: tenant
-    type: string
-  PortName:
-    description: Name of the port
-    default: ''
-    type: string
-  ControlPlaneIP: # Here for compatability with noop.yaml
-    description: IP address on the control plane
-    default: ''
-    type: string
-  FixedIPs:
-    description: >
-        Control the IP allocation for the VIP port. E.g.
-        [{'ip_address':'1.2.3.4'}]
-    default: []
-    type: json
-  IPPool: # Here for compatibility with from_pool.yaml
-    default: {}
-    type: json
-  NodeIndex: # Here for compatibility with from_pool.yaml
-    default: 0
-    type: number
-
-resources:
-
-  TenantPort:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: TenantNetName}
-      name: {get_param: PortName}
-      fixed_ips: {get_param: FixedIPs}
-      replacement_policy: AUTO
-
-outputs:
-  ip_address:
-    description: tenant network IP
-    value: {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
-  ip_address_uri:
-    description: tenant network IP with brackets suitable for a URL
-    value:
-          list_join:
-          - ''
-          - - '['
-            - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
-            - ']'
-  ip_subnet:
-    description: IP/Subnet CIDR for the tenant network IP
-    value:
-          list_join:
-            - ''
-            - - {get_attr: [TenantPort, fixed_ips, 0, ip_address]}
-              - '/'
-              - {str_split: ['/', {get_attr: [TenantPort, subnets, 0, cidr]}, 1]}