Allow the use of flavor IDs in partition definition

Author: Matt Pryor

group_vars/openstack.yml

@@ -25,5 +25,5 @@ state_volume_size: "{{ metrics_db_maximum_size + 10 }}"
 openhpc_slurm_partitions:
   - name: "standard"
     count: "{{ compute_count }}"
-    flavor_name: "{{ compute_flavor }}"
+    flavor: "{{ compute_flavor }}"
     default: "YES"

roles/cluster_infra/templates/resources.tf.j2

@@ -379,7 +379,11 @@ resource "openstack_compute_instance_v2" "{{ partition.name }}" {
 
   name      = "{{ cluster_name }}-compute-{{ partition.name }}-${count.index}"
   image_id  = "{{ cluster_previous_image | default(cluster_image) }}"
+  {% if 'flavor_name' in partition %}
   flavor_name = "{{ partition.flavor_name }}"
+  {% else %}
+  flavor_id = "{{ partition.flavor }}"
+  {% endif %}
 
   network {
     port = openstack_networking_port_v2.{{ partition.name }}[count.index].id