Pin Compute microversion to 2.67 when using block_device

Always pin Compute microversion to 2.67 when using block_device. This solves terraform-provider-openstack#1057 while adhering to KISS priciple.
ralgar · Apr 9, 2023 · aab928d · aab928d
1 parent 9a4d145
commit aab928d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/openstack/compute_instance_v2.go b/openstack/compute_instance_v2.go
@@ -27,7 +27,7 @@ const (
 	computeV2InstanceCreateServerWithNetworkModeMicroversion = "2.37"
 	computeV2InstanceCreateServerWithTagsMicroversion        = "2.52"
 	computeV2TagsExtensionMicroversion                       = "2.26"
-	computeV2InstanceBlockDeviceVolumeTypeMicroversion       = "2.67"
+	computeV2InstanceBlockDeviceMicroversion                 = "2.67"
 )
 
 // InstanceNIC is a structured representation of a Gophercloud servers.Server

diff --git a/openstack/resource_openstack_compute_instance_v2.go b/openstack/resource_openstack_compute_instance_v2.go
@@ -554,13 +554,8 @@ func resourceComputeInstanceV2Create(ctx context.Context, d *schema.ResourceData
 			return diag.FromErr(err)
 		}
 
-		// Check if VolumeType was set in any of the Block Devices.
-		// If so, set the client's microversion appropriately.
-		for _, bd := range blockDevices {
-			if bd.VolumeType != "" {
-				computeClient.Microversion = computeV2InstanceBlockDeviceVolumeTypeMicroversion
-			}
-		}
+		// Some block_device parameters require microversion >=2.60
+		computeClient.Microversion = computeV2InstanceBlockDeviceMicroversion
 
 		createOpts = &bootfromvolume.CreateOptsExt{
 			CreateOptsBuilder: createOpts,