get lab *infra* functional based on prod

Author: sjpb

environments/lab/inventory/group_vars/nfs/overrides.yml

@@ -1,6 +1,6 @@
 ---
 
-nfs_server: "{{ (hostvars[groups['control'] | first].server_networks)['nrel-storage'][0] }}"
+nfs_server: "{{ (hostvars[groups['control'] | first].server_networks)['lab-storage'][0] }}"
 nfs_enable:
   server:  "{{ inventory_hostname in groups['control'] }}"
   # Don't mount share on server where it is exported from...

environments/lab/inventory/group_vars/openhpc/overrides.yml

@@ -1,11 +1,18 @@
-openhpc_rebuild_clouds: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/clouds.yaml"
 
-openhpc_packages_extra: "{{ openhpc_packages_extra_nrel | reject('match', '.*-impi-') }}" # don't have intel compilers available
+# openhpc_packages_extra: "{{ openhpc_packages_extra_nrel | reject('match', '.*-impi-') }}" # TODO: FIXME
+
+# define paths to slurm on nodes:
+slurm_build_version: '23.11.0' # quote to avoid ansible autoconversion weirdness
+slurm_build_path: /nopt/vtest/slurm
+slurm_build_dir: "{{ slurm_build_path }}/{{ slurm_build_version }}"
+
+openhpc_sbin_dir: "{{ slurm_build_dir }}/sbin"
+openhpc_lib_dir: "{{ slurm_build_dir }}/slurm"
+openhpc_bin_dir: "{{ slurm_build_dir }}/bin"
+openhpc_slurm_conf_path: "{{ slurm_build_dir }}/etc/slurm.conf"
+
 
 openhpc_slurm_partitions:
   - name: "sm"
     default: NO
     maxtime: "1-0" # 1 days 0 hours
-  - name: "ty"
-    default: YES
-    maxtime: "1-0" # 1 days 0 hours

environments/lab/terraform/datasources.tf

@@ -0,0 +1 @@
+../../prod/terraform/datasources.tf

environments/lab/terraform/datasources.tf

@@ -1,6 +1,7 @@
 [all:vars]
 ansible_user=rocky
 openhpc_cluster_name=${cluster_slurm_name}
+ansible_ssh_common_args='-o ProxyCommand="ssh rocky@${proxy_fip} -W %h:%p"'
 
 [control]
 ${control.name} ansible_host=${[for n in control.network: n.fixed_ip_v4 if n.access_network][0]} server_networks='${jsonencode({for net in control.network: net.name => [ net.fixed_ip_v4 ] })}'
@@ -10,17 +11,12 @@ ${control.name} ansible_host=${[for n in control.network: n.fixed_ip_v4 if n.acc
 ${login.name} ansible_host=${[for n in login.network: n.fixed_ip_v4 if n.access_network][0]} server_networks='${jsonencode({for net in login.network: net.name => [ net.fixed_ip_v4 ] })}'
 %{ endfor ~}
 
-[admin]
-${cluster_name}-admin
-
 [compute]
 %{ for compute in computes ~}
 ${compute.name} ansible_host=${[for n in compute.network: n.fixed_ip_v4 if n.access_network][0]} server_networks='${jsonencode({for net in compute.network: net.name => [ net.fixed_ip_v4 ] })}'
 %{ endfor ~}
 
-# Define groups for slurm parititions:
-[${cluster_slurm_name}_sm]
-${cluster_name}-sm-00[1:2]
+## Define groups for slurm parititions:
 
-[${cluster_slurm_name}_ty]
-${cluster_name}-ty-00[1:2]
+[${cluster_slurm_name}_sm]
+${cluster_name}-sm-[0001:0002]