Better support for 2-port instances

- When creating 2-port instances, check for security groups on each net.
- Add NodeNet2WithFIP to the nodenet library.

Author: oneswig

files/environments/nodenet-library.yaml

@@ -5,6 +5,7 @@ resource_registry:
   Cluster::NodeNet1WithFIP: ../resources/nodenet-w-fip.yaml
   Cluster::NodeNet1WithPreallocatedFIP: ../resources/nodenet-w-prealloc-fip.yaml
   Cluster::NodeNet2: ../resources/nodenet-2.yaml
+  Cluster::NodeNet2WithFIP: ../resources/nodenet-2-w-fip.yaml
   Cluster::NodeNet3: ../resources/nodenet-3.yaml
   Cluster::NodeNet2WithFIPSRIOV: ../resources/nodenet-2-w-fip-sriov.yaml
   Cluster::NodeNet3WithFIPSRIOV: ../resources/nodenet-3-w-fip-sriov.yaml

files/resources/cluster-group.yaml

@@ -44,7 +44,10 @@ parameters:
           - "Cluster::NodeNet1WithFIP"
           - "Cluster::NodeNet1WithPreallocatedFIP"
           - "Cluster::NodeNet2"
+          - "Cluster::NodeNet2WithFIP"
+          - "Cluster::NodeNet2WithFIPSRIOV"
           - "Cluster::NodeNet3"
+          - "Cluster::NodeNet3WithFIPSRIOV"
   group_idx:
     type: number
     label: Cluster group index

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

@@ -22,12 +22,18 @@ parameters:
     default: []
 
 conditions:
-  security_groups_set:
+  security_groups_port1:
     yaql:
       expression: $.data.cluster_net.containsKey('security_groups')
       data:
         cluster_net: { get_param: [ cluster_net, 0 ] }
 
+  security_groups_port2:
+    yaql:
+      expression: $.data.cluster_net.containsKey('security_groups')
+      data:
+        cluster_net: { get_param: [ cluster_net, 1 ] }
+
 resources:
 
   port1:
@@ -36,7 +42,7 @@ resources:
       network: { get_param: [ cluster_net, 0, net ] }
       security_groups:
         if:
-          - security_groups_set
+          - security_groups_port1
           - { get_param: [ cluster_net, 0, security_groups ] }
           - []
       fixed_ips:
@@ -47,7 +53,10 @@ resources:
     properties:
       network: { get_param: [ cluster_net, 1, net ] }
       security_groups:
-        - []
+        if:
+          - security_groups_port2
+          - { get_param: [ cluster_net, 1, security_groups ] }
+          - []
       fixed_ips:
         - subnet_id: { get_param: [ cluster_net, 1, subnet ] }
 

files/resources/nodenet-2.yaml

@@ -25,12 +25,18 @@ parameters:
     default: []
 
 conditions:
-  security_groups_set:
+  security_groups_port1:
     yaql:
       expression: $.data.cluster_net.containsKey('security_groups')
       data:
         cluster_net: { get_param: [ cluster_net, 0 ] }
 
+  security_groups_port2:
+    yaql:
+      expression: $.data.cluster_net.containsKey('security_groups')
+      data:
+        cluster_net: { get_param: [ cluster_net, 1 ] }
+
 resources:
 
   port1:
@@ -39,7 +45,7 @@ resources:
       network: { get_param: [ cluster_net, 0, net ] }
       security_groups:
         if:
-          - security_groups_set
+          - security_groups_port1
           - { get_param: [ cluster_net, 0, security_groups ] }
           - []
       fixed_ips:
@@ -51,7 +57,7 @@ resources:
       network: { get_param: [ cluster_net, 1, net ] }
       security_groups:
         if:
-          - security_groups_set
+          - security_groups_port2
           - { get_param: [ cluster_net, 1, security_groups ] }
           - []
       fixed_ips: