Merge branch 'main' into feat/compute-init-cookiecutter

Author: bertiethorpe

environments/.stackhpc/inventory/group_vars/all/openhpc.yml

@@ -1,13 +1,3 @@
 openhpc_config_extra:
   SlurmctldDebug: debug
   SlurmdDebug: debug
-
-ohpc_default_extra_repos:
-  "9": [] #overriding to ensure doesn't overwrite ark epel repo
-  "8":
-    - name: epel
-      file: epel
-      description: "Extra Packages for Enterprise Linux 8 - $basearch"
-      metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir"
-      gpgcheck: true
-      gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"

environments/.stackhpc/terraform/cluster_image.auto.tfvars.json

@@ -1,6 +1,6 @@
 {
     "cluster_image": {
-        "RL8": "openhpc-RL8-250107-1534-b03caaf3",
-        "RL9": "openhpc-RL9-250107-1535-b03caaf3"
+        "RL8": "openhpc-RL8-250108-1703-e515b902",
+        "RL9": "openhpc-RL9-250108-1703-e515b902"
     }
 }

environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf

@@ -3,16 +3,22 @@ module "compute" {
 
   for_each = var.compute
 
+  # must be set for group:
   nodes = each.value.nodes
+  flavor = each.value.flavor
+
   cluster_name = var.cluster_name
   cluster_domain_suffix = var.cluster_domain_suffix
   cluster_net_id = data.openstack_networking_network_v2.cluster_net.id
   cluster_subnet_id = data.openstack_networking_subnet_v2.cluster_subnet.id
 
-  flavor = each.value.flavor
+  # can be set for group, defaults to top-level value:
   image_id = lookup(each.value, "image_id", var.cluster_image_id)
   vnic_type = lookup(each.value, "vnic_type", var.vnic_type)
   vnic_profile = lookup(each.value, "vnic_profile", var.vnic_profile)
+  volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
+  root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
+
   key_pair = var.key_pair
   environment_root = var.environment_root
   k3s_token = var.k3s_token

environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf

@@ -53,6 +53,8 @@ variable "compute" {
             vnic_type: Overrides variable vnic_type
             vnic_profile: Overrides variable vnic_profile
             compute_init_enable: Toggles compute-init rebuild (see compute-init role docs)
+            volume_backed_instances: Overrides variable volume_backed_instances
+            root_volume_size: Overrides variable root_volume_size
     EOF
 }