tidy PR

Author: sjpb

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

@@ -1,17 +1,8 @@
 cluster_networks = [
-    # {
-    #     network = "stackhpc-ipv4-geneve"
-    #     subnet = "stackhpc-ipv4-geneve-subnet"
-    # }
     {
-        network = "steveb-isolated"
-        subnet = "steveb-isolated"
+        network = "stackhpc-ipv4-geneve"
+        subnet = "stackhpc-ipv4-geneve-subnet"
     }
 ]
 control_node_flavor = "general.v1.small"
-other_node_flavor = "general.v1.small"
-
-
-# stackhpc-ipv4-geneve-subnet:  172.16.0.0 - 172.16.1.255
-# stackhpc-ipv4-vlan-subnet     192.168.48.0 - 192.168.48.255
-# steveb-isolated 192.168.99.0 - 192.168.99.255
+other_node_flavor = "general.v1.small"

environments/.stackhpc/tofu/SMS.tfvars

@@ -64,8 +64,7 @@ module "cluster" {
     cluster_name = var.cluster_name
     cluster_networks = var.cluster_networks
     vnic_types = var.vnic_types
-    #key_pair = "slurm-app-ci" # TODO: make this a variable
-    key_pair = "steveb-slurm-deploy"
+    key_pair = "slurm-app-ci"
     cluster_image_id = data.openstack_images_image_v2.cluster.id
     control_node_flavor = var.control_node_flavor
 

environments/.stackhpc/tofu/main.tf

@@ -8,7 +8,6 @@ appliances_cockpit_state: absent # RHEL cockpit installed but not enabled in gen
 #appliances_state_dir: # define an absolute path here to use for persistent state: NB: This is defined as /var/lib/state in inventory by the default Terraform
 appliances_mode: configure
 appliances_pulp_url: https://ark.stackhpc.com
-appliances_remote_environment_vars: {} # Variables for remote environment - not supported on all plays
 
 # Address(ip/dns) for internal communication between services. This is
 # normally traffic you do no want to expose to users.