Avoid duplicate port attachment. Fix #25

brtkwr · brtkwr · commit 94caac72fa2c · 2020-02-17T15:28:51.000Z
Signed-off-by: Bharat Kunwar &lt;brtknr@bath.edu&gt;
diff --git a/files/resources/cluster-group.yaml b/files/resources/cluster-group.yaml
@@ -141,6 +141,7 @@ resources:
           config_drive: { get_param: cluster_config_drive }
           group_node_ports: { get_attr: [port_group, networks] }
           group_node_ips: { get_attr: [port_group, primary_ip] }
+          group_node_internal_ips: { get_attr: [port_group, internal_ip] }
           node_idx: "%index%"
 
 outputs:
diff --git a/files/resources/instance-multi.yaml b/files/resources/instance-multi.yaml
@@ -37,6 +37,9 @@ parameters:
   group_node_ips:
     type: json
     label: List of primary IPs for all nodes in this group
+  group_node_internal_ips:
+    type: json
+    label: List of internal IPs for all nodes in this group
   node_idx:
     type: number
     label: Resource group index of this node
@@ -116,5 +119,6 @@ outputs:
     value: 
       name: {get_param: name}
       ip: {get_param: [group_node_ips, {get_param: node_idx}]}
+      internal_ip: {get_param: [group_node_internal_ips, {get_param: node_idx}]}
       id: {get_resource: instance} 
       ports_gt_1: {equals: [ports_gt_1_yaql, True]}
diff --git a/files/resources/instance-w-volume.yaml b/files/resources/instance-w-volume.yaml
@@ -37,6 +37,9 @@ parameters:
   group_node_ips:
     type: json
     label: List of primary IPs for all nodes in this group
+  group_node_internal_ips:
+    type: json
+    label: List of internal IPs for all nodes in this group
   node_idx:
     type: number
     label: Resource group index of this node
@@ -116,4 +119,5 @@ outputs:
     value: 
       name: {get_param: name}
       ip: {get_param: [group_node_ips, {get_param: node_idx}]}
+      internal_ip: {get_param: [group_node_internal_ips, {get_param: node_idx}]}
       id: {get_resource: instance} 
diff --git a/files/resources/instance.yaml b/files/resources/instance.yaml
@@ -37,6 +37,9 @@ parameters:
   group_node_ips:
     type: json
     label: List of primary IPs for all nodes in this group
+  group_node_internal_ips:
+    type: json
+    label: List of internal IPs for all nodes in this group
   node_idx:
     type: number
     label: Resource group index of this node
@@ -67,4 +70,5 @@ outputs:
     value: 
       name: {get_param: name}
       ip: {get_param: [group_node_ips, {get_param: node_idx}]}
+      internal_ip: {get_param: [group_node_internal_ips, {get_param: node_idx}]}
       id: {get_resource: instance} 
diff --git a/files/resources/nodenet-1.yaml b/files/resources/nodenet-1.yaml
@@ -52,6 +52,11 @@ outputs:
     value: 
       - port: { get_resource: port }
 
+  internal_ip:
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port, fixed_ips, 0, ip_address ] }
+
   primary_ip:
-    description: ID of the IP assigned on the named cluster network
+    description: The primary IP of the instance
     value: { get_attr: [ port, fixed_ips, 0, ip_address ] }
diff --git a/files/resources/nodenet-2-w-fip-sriov.yaml b/files/resources/nodenet-2-w-fip-sriov.yaml
@@ -79,6 +79,12 @@ outputs:
       - port: { get_resource: port1 }
       - port: { get_resource: port2 }
 
+  internal_ip:
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port1, fixed_ips, 0, ip_address ] }
+      - { get_attr: [ port2, fixed_ips, 0, ip_address ] }
+
   primary_ip:
     description: The primary IP of the instance
     value: { get_attr: [ floating_ip, floating_ip_address ] }
diff --git a/files/resources/nodenet-2-w-fip.yaml b/files/resources/nodenet-2-w-fip.yaml
@@ -60,27 +60,27 @@ resources:
     type: OS::Neutron::FloatingIPAssociation
     properties:
       floatingip_id: { get_resource: floating_ip }
-      port_id: { get_resource: port }
+      port_id: { get_resource: port1 }
 
 outputs:
   OS::stack_id:
     description: The network list
     value:
-      - port: { get_resource: port }
+      - port1: { get_resource: port1 }
+      - port2: { get_resource: port2 }
 
   networks:
     description: The network list
     value:
-      - port: { get_resource: port }
+      - port: { get_resource: port1 }
+      - port: { get_resource: port2 }
 
-  internal_ip1:
-    description: ID of the IP assigned on the first named cluster network
-    value: { get_attr: [ port, fixed_ips, 0, ip_address ] }
-
-  internal_ip2:
-    description: ID of the IP assigned on the second cluster network
-    value: { get_attr: [ port, fixed_ips, 1, ip_address ] }
+  internal_ip:
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port1, fixed_ips, 0, ip_address ] }
+      - { get_attr: [ port2, fixed_ips, 0, ip_address ] }
 
   primary_ip:
-    description: ID of the Neutron floating IP
+    description: The primary IP of the instance
     value: { get_attr: [ floating_ip, floating_ip_address ] }
diff --git a/files/resources/nodenet-2.yaml b/files/resources/nodenet-2.yaml
@@ -78,6 +78,12 @@ outputs:
       - port: { get_resource: port1 }
       - port: { get_resource: port2 }
 
+  internal_ip:
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port1, fixed_ips, 0, ip_address ] }
+      - { get_attr: [ port2, fixed_ips, 0, ip_address ] }
+
   primary_ip:
-    description: ID of the IP assigned on the named cluster network
+    description: The primary IP of the instance
     value: { get_attr: [ port1, fixed_ips, 0, ip_address ] }
diff --git a/files/resources/nodenet-3.yaml b/files/resources/nodenet-3.yaml
@@ -83,6 +83,13 @@ outputs:
       - port: { get_resource: port2 }
       - port: { get_resource: port3 }
 
+  internal_ip:
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port1, fixed_ips, 0, ip_address ] }
+      - { get_attr: [ port2, fixed_ips, 0, ip_address ] }
+      - { get_attr: [ port3, fixed_ips, 0, ip_address ] }
+
   primary_ip:
-    description: ID of the IP assigned on the named cluster network
+    description: The primary IP of the instance
     value: { get_attr: [ port1, fixed_ips, 0, ip_address ] }
diff --git a/files/resources/nodenet-w-fip.yaml b/files/resources/nodenet-w-fip.yaml
@@ -65,9 +65,10 @@ outputs:
       - 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 ] }
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port, fixed_ips, 0, ip_address ] }
 
   primary_ip:
-    description: ID of the Neutron floating IP
+    description: The primary IP of the instance
     value: { get_attr: [ floating_ip, floating_ip_address ] }
diff --git a/files/resources/nodenet-w-prealloc-fip.yaml b/files/resources/nodenet-w-prealloc-fip.yaml
@@ -60,9 +60,10 @@ outputs:
       - 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 ] }
+    description: The IP assigned on the named cluster networks
+    value:
+      - { get_attr: [ port, fixed_ips, 0, ip_address ] }
 
   primary_ip:
-    description: ID of the Neutron floating IP
+    description: The primary IP of the instance
     value: { get_param: [ cluster_fips, {get_param: node_idx}, ip ] }
diff --git a/library/os_server_interface.py b/library/os_server_interface.py
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -42,29 +42,10 @@
   when: cluster_state == 'query'
 
 - block:
-    - name: Extract server ids from cluster group output
-      set_fact:
-        cluster_servers: "{{ cluster_group.output_value | json_query('[*].nodes[*].id') | flatten }}"
-        cluster_interfaces: "{{ cluster_params.cluster_net | map(attribute='net') | list }}"
-
-    - name: Attach interfaces to servers
-      os_server_interface:
-        auth_type: "{{ cluster_auth_type or omit }}"
-        auth: "{{ cluster_auth or omit }}"
-        cloud: "{{ cluster_cloud or omit }}"
-        state: "{{ cluster_state }}"
-        server_id: "{{ item }}"
-        interfaces: "{{ cluster_interfaces }}"
-      with_items: "{{ cluster_servers }}"
-      register: openstack_server_interfaces
-
-    - name: Convert list of interfaces to a dictionary for easy lookup in inventory templating step
-      set_fact:
-        cluster_server_interfaces: "{{ dict(cluster_servers | zip(openstack_server_interfaces.results)) }}"
-
     - name: Extract node objects
       set_fact:
         cluster_nodes: "{{ cluster_group.output_value | sum(attribute='nodes', start=[]) }}"
+        cluster_nets: "{{ cluster_params.cluster_net | map(attribute='net') | list }}"
 
     - name: Prepare access via intermediate gateway
       block:
diff --git a/templates/cluster_inventory.j2 b/templates/cluster_inventory.j2
@@ -16,7 +16,7 @@ cluster
 {% for group_data in cluster_group.output_value %}
 [{{ cluster_name }}_{{ group_data.group }}]
 {% for node_data in group_data.nodes %}
-{{ node_data.name }} ansible_host={{ node_data.ip }} server_networks='{{ cluster_server_interfaces[node_data.id].server_networks | to_json }}'
+{{ node_data.name }} ansible_host={{ node_data.ip }} server_networks='{{ dict(cluster_nets | zip(node_data.internal_ip)) | to_json }}'
 {% endfor %}
 
 [{{ cluster_name }}_{{ group_data.group }}:vars]
