Merge pull request #6718 from buzztroll/vet/keyed_fields

provider/openstack: Fixes an vet error.
hashicorp · May 17, 2016 · d3b0a30 · d3b0a30
2 parents 71def12 + 99ab233
commit d3b0a30
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
@@ -391,8 +391,8 @@ func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) e
 	if vL, ok := d.GetOk("block_device"); ok {
 		blockDevices := resourceInstanceBlockDevicesV2(d, vL.([]interface{}))
 		createOpts = &bootfromvolume.CreateOptsExt{
-			createOpts,
-			blockDevices,
+			CreateOptsBuilder: createOpts,
+			BlockDevice:       blockDevices,
 		}
 	}