provider/openstack: Block Device Tests and Docs (#10830)

This commit adds some basic tests for block device functionality. It also
expands the existing block device documentation as well references the
new "volume attach" resources for further block storage functionality.

builtin/providers/openstack/resource_openstack_compute_instance_v2_test.go

@@ -857,6 +857,89 @@ func TestAccComputeV2Instance_bootFromVolumeForceNew(t *testing.T) {
 	})
 }
 
+func TestAccComputeV2Instance_blockDeviceNewVolume(t *testing.T) {
+	var instance_1 servers.Server
+	var testAccComputeV2Instance_blockDeviceNewVolume = fmt.Sprintf(`
+		resource "openstack_compute_instance_v2" "instance_1" {
+			name = "instance_1"
+			security_groups = ["default"]
+			block_device {
+				uuid = "%s"
+				source_type = "image"
+				destination_type = "local"
+				boot_index = 0
+				delete_on_termination = true
+			}
+			block_device {
+				source_type = "blank"
+				destination_type = "volume"
+				volume_size = 1
+				boot_index = 1
+				delete_on_termination = true
+			}
+		}`,
+		os.Getenv("OS_IMAGE_ID"))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckComputeV2InstanceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccComputeV2Instance_blockDeviceNewVolume,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeV2InstanceExists(t, "openstack_compute_instance_v2.instance_1", &instance_1),
+				),
+			},
+		},
+	})
+}
+
+func TestAccComputeV2Instance_blockDeviceExistingVolume(t *testing.T) {
+	var instance_1 servers.Server
+	var volume_1 volumes.Volume
+	var testAccComputeV2Instance_blockDeviceExistingVolume = fmt.Sprintf(`
+		resource "openstack_blockstorage_volume_v1" "volume_1" {
+			name = "volume_1"
+			size = 1
+		}
+
+		resource "openstack_compute_instance_v2" "instance_1" {
+			name = "instance_1"
+			security_groups = ["default"]
+			block_device {
+				uuid = "%s"
+				source_type = "image"
+				destination_type = "local"
+				boot_index = 0
+				delete_on_termination = true
+			}
+			block_device {
+				uuid = "${openstack_blockstorage_volume_v1.volume_1.id}"
+				source_type = "volume"
+				destination_type = "volume"
+				boot_index = 1
+				delete_on_termination = true
+			}
+		}`,
+		os.Getenv("OS_IMAGE_ID"))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckComputeV2InstanceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccComputeV2Instance_blockDeviceExistingVolume,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeV2InstanceExists(t, "openstack_compute_instance_v2.instance_1", &instance_1),
+					testAccCheckBlockStorageV1VolumeExists(t, "openstack_blockstorage_volume_v1.volume_1", &volume_1),
+				),
+			},
+		},
+	})
+}
+
 // TODO: verify the personality really exists on the instance.
 func TestAccComputeV2Instance_personality(t *testing.T) {
 	var instance servers.Server

website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown

@@ -110,6 +110,67 @@ resource "openstack_compute_instance_v2" "boot-from-volume" {
 }
 ```
 
+### Boot Instance, Create Volume, and Attach Volume as a Block Device
+
+```
+resource "openstack_compute_instance_v2" "instance_1" {
+  name = "instance_1"
+  image_id = "<image-id>"
+  flavor_id = "3"
+  key_pair = "my_key_pair_name"
+  security_groups = ["default"]
+
+  block_device {
+    uuid = "<image-id>"
+    source_type = "image"
+    destination_type = "local"
+    boot_index = 0
+    delete_on_termination = true
+  }
+
+  block_device {
+    source_type = "blank"
+    destination_type = "volume"
+    volume_size = 1
+    boot_index = 1
+    delete_on_termination = true
+  }
+}
+```
+
+### Boot Instance and Attach Existing Volume as a Block Device
+
+```
+resource "openstack_blockstorage_volume_v2" "volume_1" {
+  name = "volume_1"
+  size = 1
+}
+
+resource "openstack_compute_instance_v2" "instance_1" {
+  name = "instance_1"
+  image_id = "<image-id>"
+  flavor_id = "3"
+  key_pair = "my_key_pair_name"
+  security_groups = ["default"]
+
+  block_device {
+    uuid = "<image-id>"
+    source_type = "image"
+    destination_type = "local"
+    boot_index = 0
+    delete_on_termination = true
+  }
+
+  block_device {
+    uuid = "${openstack_blockstorage_volume_v2.volume_1.id}"
+    source_type = "volume"
+    destination_type = "volume"
+    boot_index = 1
+    delete_on_termination = true
+  }
+}
+```
+
 ### Instance With Multiple Networks
 
 ```
@@ -251,13 +312,18 @@ The following arguments are supported:
     pair must already be created and associated with the tenant's account.
     Changing this creates a new server.
 
-* `block_device` - (Optional) The object for booting by volume. The block_device
-    object structure is documented below. Changing this creates a new server.
+* `block_device` - (Optional) Configuration of block devices. The block_device
+    structure is documented below. Changing this creates a new server.
     You can specify multiple block devices which will create an instance with
-    multiple ephemeral (local) disks.
+    multiple disks. This configuration is very flexible, so please see the
+    following [reference](http://docs.openstack.org/developer/nova/block_device_mapping.html)
+    for more information.
 
 * `volume` - (Optional) Attach an existing volume to the instance. The volume
-    structure is described below.
+    structure is described below. *Note*: This is no longer the recommended
+    method of attaching a volume to an instance. Please see `block_device`
+    (above) or the `openstack_compute_volume_attach_v2` and
+    `openstack_blockstorage_volume_attach_v2` resources.
 
 * `scheduler_hints` - (Optional) Provide the Nova scheduler with hints on how
     the instance should be launched. The available hints are described below.
@@ -306,7 +372,8 @@ The `block_device` block supports:
 
 * `volume_size` - The size of the volume to create (in gigabytes). Required
     in the following combinations: source=image and destination=volume,
-    source=blank and destination=local. Changing this creates a new server.
+    source=blank and destination=local, and source=blank and destination=volume.
+    Changing this creates a new server.
 
 * `boot_index` - (Optional) The boot index of the volume. It defaults to 0.
     Changing this creates a new server.