fix caas for openhpc_partitions/openhpc_nodegroups

Author: sjpb

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

@@ -32,7 +32,7 @@ output "cluster_nodes" {
         }
       }
     ],
-    {% for partition in openhpc_slurm_partitions %}
+    {% for partition in openhpc_partitions %}
     [
       for compute in openstack_compute_instance_v2.{{ partition.name }}: {
         name          = compute.name

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

@@ -282,7 +282,7 @@ resource "openstack_networking_port_v2" "control_storage" {
 ###
 # Workers
 ###
-{% for partition in openhpc_slurm_partitions %}
+{% for partition in openhpc_partitions %}
 # Primary network
 resource "openstack_networking_port_v2" "{{ partition.name }}" {
   count = {{ partition.count }}
@@ -499,7 +499,7 @@ resource "openstack_compute_instance_v2" "control" {
   }
 }
 
-{% for partition in openhpc_slurm_partitions %}
+{% for partition in openhpc_partitions %}
 resource "openstack_compute_instance_v2" "{{ partition.name }}" {
   count = {{ partition.count }}
 

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

@@ -1,5 +1,5 @@
 openhpc_cluster_name: "{{ cluster_name }}"
 
-# Provision a single "standard" compute partition using the supplied
+# Provision a single "standard" compute nodegroup using the supplied
 # node count and flavor
-openhpc_slurm_partitions: "{{ hostvars[groups['openstack'][0]]['openhpc_slurm_partitions'] }}"
+openhpc_nodegroups: "{{ hostvars[groups['openstack'][0]]['openhpc_nodegroups'] }}"

environments/.caas/inventory/group_vars/all/openondemand.yml

@@ -1,7 +1,7 @@
 ---
 openondemand_auth: basic_pam
-openondemand_jupyter_partition: "{{ openhpc_slurm_partitions[0]['name'] }}"
-openondemand_desktop_partition: "{{ openhpc_slurm_partitions[0]['name'] }}"
+openondemand_jupyter_partition: "{{ openhpc_partitions[0]['name'] }}"
+openondemand_desktop_partition: "{{ openhpc_partitions[0]['name'] }}"
 
 httpd_listen_addr_port:
   - 80

environments/.caas/inventory/group_vars/openstack.yml

@@ -16,9 +16,9 @@ terraform_project_path: "{{ playbook_dir }}/terraform"
 terraform_state: "{{ cluster_state | default('present') }}"
 cluster_ssh_user: rocky
 
-# Provision a single "standard" compute partition using the supplied
+# Provision a single "standard" compute nodegroup using the supplied
 # node count and flavor
-openhpc_slurm_partitions:
+openhpc_nodegroups:
   - name: "standard"
     count: "{{ compute_count }}"
     flavor: "{{ compute_flavor }}"