configure storage network components based on cluster_storage_network ,set storage port mode based on cluster_storage_vnic_type

Author: scrungus

ansible/roles/cluster_infra/templates/resources.tf.j2

@@ -116,10 +116,12 @@ data "openstack_networking_network_v2" "cluster_external_network" {
   name = "{{ cluster_external_network }}"
 }
 
-# Always get the SRIOV storage network 
-data "openstack_networking_network_v2" "portal_storage_direct" {
-  tags = ["portal-storage-direct"]
+# SRIOV storage network 
+{% if cluster_storage_network is defined %}
+data "openstack_networking_network_v2" "cluster_storage_direct" {
+  name = "{{ cluster_storage_network }}"
 }
+{% endif %}
 
 data "openstack_networking_subnet_ids_v2" "cluster_external_subnets" {
   network_id = "${data.openstack_networking_network_v2.cluster_external_network.id}"
@@ -186,7 +188,7 @@ data "openstack_networking_subnet_v2" "cluster_subnet" {
 # Login node
 ###
 
-# VXLAN
+# Primary network
 resource "openstack_networking_port_v2" "login" {
   name = "{{ cluster_name }}-login-0"
   network_id = "${data.openstack_networking_network_v2.cluster_network.id}"
@@ -212,9 +214,10 @@ resource "openstack_networking_port_v2" "login" {
 }
 
 # Storage VLAN
-resource "openstack_networking_port_v2" "login_portal_storage" {
-  name           = "{{ cluster_name }}-login-0-portal-storage"
-  network_id     = data.openstack_networking_network_v2.portal_storage_direct.id
+{% if cluster_storage_network is defined %}
+resource "openstack_networking_port_v2" "login_storage" {
+  name           = "{{ cluster_name }}-login-storage-0"
+  network_id     = data.openstack_networking_network_v2.cluster_storage_direct.id
   admin_state_up = "true"
 
   # not sure if needed here
@@ -225,15 +228,16 @@ resource "openstack_networking_port_v2" "login_portal_storage" {
 
   # for now, until we set up flavors
   binding {
-    vnic_type = "normal"
+    vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
 }
+{% endif %}
 
 ###
 # Control node
 ###
 
-# VLXAN
+# Primary network
 resource "openstack_networking_port_v2" "control" {
   name = "{{ cluster_name }}-control-0"
   network_id = "${data.openstack_networking_network_v2.cluster_network.id}"
@@ -258,10 +262,10 @@ resource "openstack_networking_port_v2" "control" {
 }
 
 # Storage VLAN
-
-resource "openstack_networking_port_v2" "control_portal_storage" {
-  name           = "{{ cluster_name }}-control-0-portal-storage"
-  network_id     = data.openstack_networking_network_v2.portal_storage_direct.id
+{% if cluster_storage_network is defined %}
+resource "openstack_networking_port_v2" "control_storage" {
+  name           = "{{ cluster_name }}-control-storage-0"
+  network_id     = data.openstack_networking_network_v2.cluster_storage_direct.id
   admin_state_up = "true"
 
   # not sure if needed here
@@ -271,15 +275,16 @@ resource "openstack_networking_port_v2" "control_portal_storage" {
 
   # for now, until we set up flavors
   binding {
-    vnic_type = "normal"
+    vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
 }
+{% endif %}
 
 ###
 # Workers
 ###
 {% for partition in openhpc_slurm_partitions %}
-# VXLAN
+# Primary network
 resource "openstack_networking_port_v2" "{{ partition.name }}" {
   count = {{ partition.count }}
   name = "{{ cluster_name }}-compute-{{ partition.name }}-${count.index}"
@@ -305,10 +310,11 @@ resource "openstack_networking_port_v2" "{{ partition.name }}" {
 }
 
 # Storage VLAN
-resource "openstack_networking_port_v2" "{{ partition.name }}_portal_storage" {
+{% if cluster_storage_network is defined %}
+resource "openstack_networking_port_v2" "{{ partition.name }}_storage" {
   count          = {{ partition.count }}
-  name           = "{{ cluster_name }}-compute-{{ partition.name }}-${count.index}-portal-storage"
-  network_id     = data.openstack_networking_network_v2.portal_storage_direct.id
+  name           = "{{ cluster_name }}-compute-{{ partition.name }}-storage-${count.index}"
+  network_id     = data.openstack_networking_network_v2.cluster_storage_direct.id
   admin_state_up = "true"
 
   # not sure if needed here
@@ -318,9 +324,10 @@ resource "openstack_networking_port_v2" "{{ partition.name }}_portal_storage" {
 
   # for now, until we set up flavors
   binding {
-    vnic_type = "normal"
+    vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
 }
+{% endif %}
 
 {% endfor %}
 
@@ -350,9 +357,11 @@ resource "openstack_compute_instance_v2" "login" {
     port = openstack_networking_port_v2.login.id
   }
 
+  {% if cluster_storage_network is defined %}
   network {
-    port = openstack_networking_port_v2.login_portal_storage.id
+    port = openstack_networking_port_v2.login_storage.id
   }
+  {% endif %}
 
   # root device:
   block_device {
@@ -397,9 +406,11 @@ resource "openstack_compute_instance_v2" "control" {
     port = openstack_networking_port_v2.control.id
   }
 
+  {% if cluster_storage_network is defined %}
   network {
-    port = openstack_networking_port_v2.control_portal_storage.id
+    port = openstack_networking_port_v2.control_storage.id
   }
+  {% endif %}
 
   # root device:
   block_device {
@@ -474,9 +485,11 @@ resource "openstack_compute_instance_v2" "{{ partition.name }}" {
     port = openstack_networking_port_v2.{{ partition.name }}[count.index].id
   }
 
+  {% if cluster_storage_network is defined %}
   network {
-    port = openstack_networking_port_v2.{{ partition.name }}_portal_storage[count.index].id
+    port = openstack_networking_port_v2.{{ partition.name }}_storage[count.index].id
   }
+  {% endif %}
 
   # root device:
   block_device {