Merge branch 'prod2312-merger' into prod2312

sjpb · sjpb · commit fa0900f3c13a · 2024-02-28T16:43:04.000Z
diff --git a/environments/vtest/terraform/datasources.tf b/environments/vtest/terraform/datasources.tf
@@ -25,3 +25,11 @@ data "openstack_networking_subnet_v2" "cluster" {
 data "openstack_networking_subnet_v2" "control" {
   name = var.control_subnet
 }
+
+data "openstack_images_image_v2" "control" {
+  name = var.control_image
+}
+
+data "openstack_blockstorage_volume_v3" "state" {
+    name = "${var.cluster_name}-state"
+}
diff --git a/environments/vtest/terraform/terraform.tfvars b/environments/vtest/terraform/terraform.tfvars
@@ -56,7 +56,6 @@ 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"
