Introduce a new node net resource template: NodeNet1WithPreallocatedFIP

This is for cases where we must use existing pre-allocated floating IPs.

Author: oneswig

files/environments/nodenet-library.yaml

@@ -2,5 +2,6 @@
 resource_registry:
   Cluster::NodeNet1: ../resources/nodenet-1.yaml
   Cluster::NodeNet1WithFIP: ../resources/nodenet-w-fip.yaml
+  Cluster::NodeNet1WithPreallocatedFIP: ../resources/nodenet-w-prealloc-fip.yaml
   Cluster::NodeNet2: ../resources/nodenet-2.yaml
   Cluster::NodeNet3: ../resources/nodenet-3.yaml

files/resources/cluster-group.yaml

@@ -69,6 +69,11 @@ conditions:
       expression: $.data.cluster_group.containsKey('nodenet_resource')
       data:
         cluster_group: { get_param: [cluster_groups, {get_param: group_idx}] }
+  nodenet_fips_set:
+    yaql:
+      expression: $.data.cluster_group.containsKey('nodenet_fips')
+      data:
+        cluster_group: { get_param: [cluster_groups, {get_param: group_idx}] }
 
 resources:
   port_group:
@@ -83,6 +88,12 @@ resources:
             - { get_param: cluster_nodenet_resource }
         properties:
           cluster_net: { get_param: cluster_net }
+          cluster_fips:
+            if:
+              - nodenet_fips_set
+              - { get_param: [cluster_groups, {get_param: group_idx}, nodenet_fips ] }
+              - []
+          node_idx: "%index%"
 
   node_group:
     type: OS::Heat::ResourceGroup

files/resources/nodenet-1.yaml

@@ -6,9 +6,16 @@ description: >
   a named network and subnet (and does not have a floating IP)
 
 parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
   cluster_net:
     type: json
     label: Network names and subnets to which the nodes should be attached
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
 
 conditions:
   security_groups_set:

files/resources/nodenet-2-w-fip.yaml

@@ -6,9 +6,16 @@ description: >
   a named network and subnet. A floating IP is created for the port.
 
 parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
   cluster_net:
     type: json
     label: Network names and subnets to which the nodes should be attached
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
 
 conditions:
   security_groups_set:

files/resources/nodenet-2.yaml

@@ -9,9 +9,16 @@ description: >
   the node.
 
 parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
   cluster_net:
     type: json
     label: Network names and subnets to which the nodes should be attached
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
 
 conditions:
   security_groups_set:

files/resources/nodenet-3.yaml

@@ -9,9 +9,16 @@ description: >
   the node.
 
 parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
   cluster_net:
     type: json
     label: Network names and subnets to which the nodes should be attached
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
 
 conditions:
   security_groups_set:

files/resources/nodenet-w-fip.yaml

@@ -6,9 +6,16 @@ description: >
   a named network and subnet. A floating IP is created for the port.
 
 parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
   cluster_net:
     type: json
     label: Network names and subnets to which the nodes should be attached
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
 
 conditions:
   security_groups_set:

files/resources/nodenet-w-prealloc-fip.yaml

@@ -0,0 +1,63 @@
+---
+heat_template_version: pike
+
+description: >
+  Heat stack template for a stack containing one Neutron port which is on
+  a named network and subnet. A floating IP is created for the port.
+
+parameters:
+  node_idx:
+    type: number
+    label: Node index within cluster group
+  cluster_fips:
+    type: json
+    label: List of UUIDs of prealloacted floating IPs
+    default: []
+  cluster_net:
+    type: json
+    label: Network names and subnets to which the nodes should be attached
+
+conditions:
+  security_groups_set:
+    yaql:
+      expression: $.data.cluster_net.containsKey('security_groups')
+      data:
+        cluster_net: { get_param: [ cluster_net, 0 ] }
+
+resources:
+  port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: [ cluster_net, 0, net ] }
+      security_groups:
+        if:
+          - security_groups_set
+          - { get_param: [ cluster_net, 0, security_groups ] }
+          - []
+      fixed_ips:
+        - subnet_id: { get_param: [ cluster_net, 0, subnet ] }
+
+  floating_ip_association:
+    type: OS::Neutron::FloatingIPAssociation
+    properties:
+      floatingip_id: { get_param: [ cluster_fips, {get_param: node_idx}, uuid ] }
+      port_id: { get_resource: port }
+
+outputs:
+  OS::stack_id:
+    description: The network list
+    value:
+      - port: { get_resource: port }
+
+  networks:
+    description: The network list
+    value:
+      - port: { get_resource: port }
+
+  internal_ip:
+    description: ID of the IP assigned on the named cluster network
+    value: { get_attr: [ port, fixed_ips, 0, ip_address ] }
+
+  primary_ip:
+    description: ID of the Neutron floating IP
+    value: { get_param: [ cluster_fips, {get_param: node_idx}, ip ] }