Merge branch 'prod2312' into prod2312-merger

Author: sjpb

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

@@ -1,46 +1,46 @@
 openhpc_install_type: generic # i.e. don't want OpenHPC
 openhpc_packages_extra_nrel: # extra indirection to allow lab environment to filter this
-  - bzip2
-  - curl
-  - fio
-  - libaio
-  - libaio-devel
-  - git
-  - gzip
-  - make
-  - patch
-  - tar
-  - unzip
-  - wget
-  - xz
-  - zstd
-  - tmux
-  - vim
-  - nano
-  - python39-devel
-
-  - slurm-libpmi-ohpc
-  - slurm-sview-ohpc
-  - slurm-libpmi-ohpc
-  - docs-ohpc
-  - EasyBuild-ohpc
-  - ohpc-autotools
-  - cmake-ohpc
-  - hwloc-ohpc
-  - singularity-ohpc
-  - slurm-libpmi-ohpc
-  - slurm-sview-ohpc
-  - slurm-libpmi-ohpc
-  - ohpc-base
-  - ohpc-base-compute
-  - ohpc-slurm-client
-  - lmod-ohpc
-  - nhc-ohpc
-  - valgrind-ohpc
-  - clustershell
-  - conman-ohpc
-  - magpie-ohpc
-  - charliecloud-ohpc
+  # - bzip2
+  # - curl
+  # - fio
+  # - libaio
+  # - libaio-devel
+  # - git
+  # - gzip
+  # - make
+  # - patch
+  # - tar
+  # - unzip
+  # - wget
+  # - xz
+  # - zstd
+  # - tmux
+  # - vim
+  # - nano
+  # - python39-devel
+
+  # - slurm-libpmi-ohpc
+  # - slurm-sview-ohpc
+  # - slurm-libpmi-ohpc
+  # - docs-ohpc
+  # - EasyBuild-ohpc
+  # - ohpc-autotools
+  # - cmake-ohpc
+  # - hwloc-ohpc
+  # - singularity-ohpc
+  # - slurm-libpmi-ohpc
+  # - slurm-sview-ohpc
+  # - slurm-libpmi-ohpc
+  # - ohpc-base
+  # - ohpc-base-compute
+  # - ohpc-slurm-client
+  # - lmod-ohpc
+  # - nhc-ohpc
+  # - valgrind-ohpc
+  # - clustershell
+  # - conman-ohpc
+  # - magpie-ohpc
+  # - charliecloud-ohpc
 
 
 

environments/vtest/terraform/terraform.tfvars

@@ -40,12 +40,12 @@ login_names = {
   login-1: "vermilion_util_c8m15"
   admin: "vermilion_util_c8m15"
 }
-proxy_name = "admin"
+proxy_name = "vtadmin"
 
 # name: IPaddr
 login_ips = {
-  login-1: "10.60.105.71"
-  admin: "10.60.105.73"
+  vtlogin-1: "10.60.105.71"
+  vtadmin: "10.60.105.73"
 }
 
 login_image = "slurm_rocky93_kbs"
@@ -56,7 +56,7 @@ login_flavor = "vermilion_util_c8m15"
 control_image = "slurm_rocky93_kbs"
 control_flavor = "vermilion_util_c8m15"
 control_ip = "10.60.105.70"
-
+control_name = "vtcontrol"
 ###################################################
 
 cluster_name  = "vtest"