provider/openstack BlockStorage v1 availability_zone Fix (hashicorp#11949)

* vendor: Updating Gophercloud

* provider/openstack: Fix upstream AvailabilityZone field

This commit complements an upstream fix where "availability" was being sent instead of
"availability_zone".

Author: jtopjian

builtin/providers/openstack/resource_openstack_blockstorage_volume_v1.go

@@ -112,15 +112,15 @@ func resourceBlockStorageVolumeV1Create(d *schema.ResourceData, meta interface{}
 	}
 
 	createOpts := &volumes.CreateOpts{
-		Description:  d.Get("description").(string),
-		Availability: d.Get("availability_zone").(string),
-		Name:         d.Get("name").(string),
-		Size:         d.Get("size").(int),
-		SnapshotID:   d.Get("snapshot_id").(string),
-		SourceVolID:  d.Get("source_vol_id").(string),
-		ImageID:      d.Get("image_id").(string),
-		VolumeType:   d.Get("volume_type").(string),
-		Metadata:     resourceContainerMetadataV2(d),
+		Description:      d.Get("description").(string),
+		AvailabilityZone: d.Get("availability_zone").(string),
+		Name:             d.Get("name").(string),
+		Size:             d.Get("size").(int),
+		SnapshotID:       d.Get("snapshot_id").(string),
+		SourceVolID:      d.Get("source_vol_id").(string),
+		ImageID:          d.Get("image_id").(string),
+		VolumeType:       d.Get("volume_type").(string),
+		Metadata:         resourceContainerMetadataV2(d),
 	}
 
 	log.Printf("[DEBUG] Create Options: %#v", createOpts)

builtin/providers/openstack/resource_openstack_blockstorage_volume_v1_test.go

@@ -162,7 +162,8 @@ const testAccBlockStorageV1Volume_basic = `
 resource "openstack_blockstorage_volume_v1" "volume_1" {
   name = "volume_1"
   description = "first test volume"
-  metadata{
+  availability_zone = "nova"
+  metadata {
     foo = "bar"
   }
   size = 1
@@ -173,7 +174,7 @@ const testAccBlockStorageV1Volume_update = `
 resource "openstack_blockstorage_volume_v1" "volume_1" {
   name = "volume_1-updated"
   description = "first test volume"
-  metadata{
+  metadata {
     foo = "bar"
   }
   size = 1