Include sub variables to vga, network, disk and serial. Remove theref…

…ore unnecessary comment in code.
wearespindle · Mar 11, 2020 · 216123f · 216123f
1 parent 7931a14
commit 216123f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/docs/resource_vm_qemu.md b/docs/resource_vm_qemu.md
@@ -104,9 +104,37 @@ The following arguments are supported in the resource block:
 * `hotplug` - (Optional; defaults to network,disk,usb)
 * `scsihw` - (Optional; defaults to the empty string)
 * `vga` - (Optional)
+    * `type` (Optional; defauls to std)
+    * `memory` (Optional)
 * `network` - (Optional)
+    * `id` (Required)
+    * `model` (Required)
+    * `macaddr` (Optional)
+    * `bridge` (Optional; defaults to nat)
+    * `tag` (Optional; defaults to -1)
+    * `firewall` (Optional; defaults to false)
+    * `rate` (Optional; defaults to -1)
+    * `queues` (Optional; defaults to -1)
+    * `link_down` (Optional; defaults to false)
 * `disk` - (Optional)
+    * `id` (Required)
+    * `type` (Required)
+    * `storage` (Required)
+    * `storage_type` (Optional; defaults to dir) One of PVE types [as described in their documentation](https://pve.proxmox.com/wiki/Storage).
+    * `size` (Required)
+    * `format` (Optional; defaults to raw)
+    * `cache` (Optional; defaults to none)
+    * `backup` (Optional; defaults to false)
+    * `iothread` (Optional; defaults to false)
+    * `replicate` (Optional; defaults to false)
+    * `mbps` (Optional; defaults to unlimited being 0) Maximum r/w speed in megabytes per second
+    * `mbps_rd` (Optional; defaults to unlimited being 0) Maximum read speed in megabytes per second
+    * `mbps_rd_max` (Optional; defaults to unlimited being 0) Maximum unthrottled read pool in megabytes per second
+    * `mbps_wr` (Optional; defaults to unlimited being 0) //Maximum write speed in megabytes per second
+    * `mbps_wr_max` (Optional; defaults to unlimited being 0) //Maximum unthrottled write pool in megabytes per second
 * `serial` - (Optional)
+    * `id` (Required)
+    * `type` (Required)
 * `pool` - (Optional)
 * `force_create` - (Optional; defaults to true)
 * `clone_wait` - (Optional)

diff --git a/proxmox/resource_vm_qemu.go b/proxmox/resource_vm_qemu.go
@@ -265,31 +265,26 @@ func resourceVmQemu() *schema.Resource {
 							Optional: true,
 							Default:  false,
 						},
-						//Maximum r/w speed in megabytes per second
 						"mbps": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
 							Default:  0,
 						},
-						//Maximum read speed in megabytes per second
 						"mbps_rd": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
 							Default:  0,
 						},
-						//Maximum unthrottled read pool in megabytes per second
 						"mbps_rd_max": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
 							Default:  0,
 						},
-						//Maximum write speed in megabytes per second
 						"mbps_wr": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
 							Default:  0,
 						},
-						//Maximum unthrottled write pool in megabytes per second
 						"mbps_wr_max": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,