From 700b82bf20a8c1400f708dad549234b7f380c95c Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Fri, 18 Aug 2017 16:48:05 +0100
Subject: Render port templates via j2

Remove these from the j2 excludes and instead render all the networks
to avoid duplication.

Change-Id: Id8e14e06ffe959c50456b4c88fef306046a8b478
Partially-Implements: blueprint composable-networks
---
 network/ports/port_from_pool.network.j2.yaml | 66 +---------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

(limited to 'network/ports/port_from_pool.network.j2.yaml')

diff --git a/network/ports/port_from_pool.network.j2.yaml b/network/ports/port_from_pool.network.j2.yaml
index 9c08ec76..ff863583 100644
--- a/network/ports/port_from_pool.network.j2.yaml
+++ b/network/ports/port_from_pool.network.j2.yaml
@@ -1,65 +1 @@
-heat_template_version: pike
-
-description: >
-  Creates a port on the {{network.name}} network, using a map of IPs per role.
-  Each role has a map of IPs in <Role>IPs parameters, with a list of IPs by
-  network (lower_name or lower case). For example:
-  ControllerIPs:
-    external:
-    - 1.2.3.4 # First controller
-    - 1.2.3.5 # Second controller
-
-parameters:
-  {{network.name}}NetName:
-    description: Name of the {{network.name}} neutron network
-    default: {{network.name_lower}}
-    type: string
-  PortName:
-    description: Name of the port
-    default: ''
-    type: string
-  ControlPlaneIP: # Here for compatibility with noop.yaml
-    description: IP address on the control plane
-    default: ''
-    type: string
-  ControlPlaneNetwork: # Here for compatibility with ctlplane_vip.yaml
-    description: The name of the undercloud Neutron control plane
-    default: ctlplane
-    type: string
-  IPPool: # Set in <Role>IPs map, see environments/ips-from-pool-all.yaml
-    default: {}
-    type: json
-  NodeIndex: # First node in the role will get first IP, and so on...
-    default: 0
-    type: number
-  {{network.name}}NetCidr:
-    default: {{network.ip_subnet}}
-    description: Cidr for the {{network.name_lower}} network.
-    type: string
-
-outputs:
-  ip_address:
-    description: {{network.name}} network IP
-    value: {get_param: [IPPool, {get_param: {{network.name}}NetName}, {get_param: NodeIndex}]}
-  ip_address_uri:
-{%- if network.ipv6 %}
-    description: {{network.name}} network IP (with brackets for IPv6 URLs)
-    value:
-          list_join:
-          - ''
-          - - '['
-            - {get_param: [IPPool, {get_param: {{network.name}}NetName}, {get_param: NodeIndex}]}
-            - ']'
-{%- else %}
-    description: {{network.name}} network IP (for compatibility with {{network.name_lower}}_v6.yaml)
-    value: {get_param: [IPPool, {get_param: {{network.name}}NetName}, {get_param: NodeIndex}]}
-{%- endif %}
-  ip_subnet:
-    description: IP/Subnet CIDR for the {{network.name}} network IP
-    value:
-      list_join:
-      - ''
-      - - {get_param: [IPPool, {get_param: {{network.name}}NetName}, {get_param: NodeIndex}]}
-        - '/'
-        - {str_split: ['/', {get_param: {{network.name}}NetCidr}, 1]}
-
+{% include 'port_from_pool.j2' %}
-- 
cgit 1.2.3-korg