fix: separate vsan fault domains and stretched cluster (#2064)

hashicorp · Nov 17, 2023 · 38e34e5 · 38e34e5
1 parent 9c25530
commit 38e34e5
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 18 deletions.
diff --git a/vsphere/internal/helper/testhelper/testing.go b/vsphere/internal/helper/testhelper/testing.go
@@ -214,3 +214,30 @@ func ConfigDSClusterData() string {
  
 `, os.Getenv("TF_VAR_VSPHERE_DS_CLUSTER1"))
 }
+
+func ConfigDataVsanHost1() string {
+	return fmt.Sprintf(`
+data "vsphere_host" "roothost1" {
+  name          = "%s"
+  datacenter_id = data.vsphere_datacenter.rootdc1.id
+}
+`, os.Getenv("TF_VSPHERE_VSAN_HOST_1"))
+}
+
+func ConfigDataVsanHost2() string {
+	return fmt.Sprintf(`
+data "vsphere_host" "roothost2" {
+  name          = "%s"
+  datacenter_id = data.vsphere_datacenter.rootdc1.id
+}
+`, os.Getenv("TF_VSPHERE_VSAN_HOST_2"))
+}
+
+func ConfigDataVsanWitnessHost() string {
+	return fmt.Sprintf(`
+data "vsphere_host" "roothost3" {
+  name          = "%s"
+  datacenter_id = data.vsphere_datacenter.rootdc1.id
+}
+`, os.Getenv("TF_VSPHERE_VSAN_WITNESS_HOST"))
+}
diff --git a/vsphere/resource_vsphere_compute_cluster.go b/vsphere/resource_vsphere_compute_cluster.go
@@ -586,9 +586,10 @@ func resourceVSphereComputeCluster() *schema.Resource {
 				},
 			},
 			"vsan_fault_domains": {
-				Type:        schema.TypeSet,
-				Optional:    true,
-				Description: "The configuration for vSAN fault domains.",
+				Type:          schema.TypeSet,
+				Optional:      true,
+				ConflictsWith: []string{"vsan_stretched_cluster"},
+				Description:   "The configuration for vSAN fault domains.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"fault_domain": {
@@ -615,10 +616,11 @@ func resourceVSphereComputeCluster() *schema.Resource {
 				},
 			},
 			"vsan_stretched_cluster": {
-				Type:        schema.TypeList,
-				MaxItems:    1,
-				Optional:    true,
-				Description: "The configuration for stretched cluster.",
+				Type:          schema.TypeList,
+				MaxItems:      1,
+				Optional:      true,
+				ConflictsWith: []string{"vsan_fault_domains"},
+				Description:   "The configuration for stretched cluster.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"preferred_fault_domain_host_ids": {
@@ -1500,9 +1502,11 @@ func expandClusterConfigSpecEx(d *schema.ResourceData, version viapi.VSphereVers
 		DrsConfig: expandClusterDrsConfigInfo(d, version),
 	}
 
-	obj.VsanHostConfigSpec, err = expandVsanHostConfig(d, props.ConfigurationEx.(*types.ClusterConfigInfoEx).VsanHostConfig)
-	if err != nil {
-		return nil, err
+	if _, stretchedClusterConfExist := d.GetOk("vsan_stretched_cluster"); !stretchedClusterConfExist {
+		obj.VsanHostConfigSpec, err = expandVsanHostConfig(d, props.ConfigurationEx.(*types.ClusterConfigInfoEx).VsanHostConfig)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if version.Newer(viapi.VSphereVersion{Product: version.Product, Major: 6, Minor: 5}) {
@@ -2029,8 +2033,10 @@ func flattenClusterConfigSpecEx(d *schema.ResourceData, obj *types.ClusterConfig
 		return err
 	}
 
-	if err := flattenClusterVsanHostConfigInfo(d, obj.VsanHostConfig); err != nil {
-		return err
+	if _, stretchedClusterConfExist := d.GetOk("vsan_stretched_cluster"); !stretchedClusterConfExist {
+		if err := flattenClusterVsanHostConfigInfo(d, obj.VsanHostConfig); err != nil {
+			return err
+		}
 	}
 
 	if version.Newer(viapi.VSphereVersion{Product: version.Product, Major: 6, Minor: 5}) {

diff --git a/vsphere/resource_vsphere_compute_cluster_test.go b/vsphere/resource_vsphere_compute_cluster_test.go
@@ -379,6 +379,7 @@ func TestAccResourceVSphereComputeCluster_vsanStretchedCluster(t *testing.T) {
 			RunSweepers()
 			testAccPreCheck(t)
 			testAccResourceVSphereComputeClusterPreCheck(t)
+			testAccResourceVSphereComputeClusterVSANStretchedClusterPreCheck(t)
 		},
 		Providers:    testAccProviders,
 		CheckDestroy: testAccResourceVSphereComputeClusterCheckExists(false),
@@ -690,6 +691,18 @@ func testAccResourceVSphereComputeClusterVSANEsaPreCheck(t *testing.T) {
 	}
 }
 
+func testAccResourceVSphereComputeClusterVSANStretchedClusterPreCheck(t *testing.T) {
+	if os.Getenv("TF_VSPHERE_VSAN_HOST_1") == "" {
+		t.Skip("set TF_VSPHERE_VSAN_HOST_1 to run vsphere_compute_cluster stretched cluster acceptance tests")
+	}
+	if os.Getenv("TF_VSPHERE_VSAN_HOST_2") == "" {
+		t.Skip("set TF_VSPHERE_VSAN_HOST_2 to run vsphere_compute_cluster stretched cluster acceptance tests")
+	}
+	if os.Getenv("TF_VSPHERE_VSAN_WITNESS_HOST") == "" {
+		t.Skip("set TF_VSPHERE_VSAN_WITNESS_HOST to run vsphere_compute_cluster stretched cluster acceptance tests")
+	}
+}
+
 func testAccResourceVSphereComputeClusterCheckExists(expected bool) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		_, err := testGetComputeCluster(s, "compute_cluster", resourceVSphereComputeClusterName)
@@ -1183,9 +1196,9 @@ resource "vsphere_compute_cluster" "compute_cluster" {
 `,
 		testhelper.CombineConfigs(
 			testhelper.ConfigDataRootDC1(),
-			testhelper.ConfigDataRootHost1(),
-			testhelper.ConfigDataRootHost2(),
-			testhelper.ConfigDataRootHost3(),
+			testhelper.ConfigDataVsanHost1(),
+			testhelper.ConfigDataVsanHost2(),
+			testhelper.ConfigDataVsanWitnessHost(),
 		),
 	)
 }
@@ -1206,9 +1219,9 @@ resource "vsphere_compute_cluster" "compute_cluster" {
 `,
 		testhelper.CombineConfigs(
 			testhelper.ConfigDataRootDC1(),
-			testhelper.ConfigDataRootHost1(),
-			testhelper.ConfigDataRootHost2(),
-			testhelper.ConfigDataRootHost3(),
+			testhelper.ConfigDataVsanHost1(),
+			testhelper.ConfigDataVsanHost2(),
+			testhelper.ConfigDataVsanWitnessHost(),
 		),
 	)
 }

diff --git a/website/docs/r/compute_cluster.html.markdown b/website/docs/r/compute_cluster.html.markdown
@@ -540,6 +540,11 @@ resource "vsphere_compute_cluster" "compute_cluster" {
       host_ids = [data.vsphere_host.faultdomain2_hosts.*.id]
     }
   }
+  vsan_stretched_cluster {
+    preferred_fault_domain_host_ids = [data.vsphere_host.preferred_fault_domain_host.*.id]
+    secondary_fault_domain_host_ids = [data.vsphere_host.secondary_fault_domain_host.*.id]
+    witness_node = data.vsphere_host.witness_host.id
+  }
 }
 ```