change PXE boot order and clean (#729)

* change boot order * delete 'del' part in doc
Telmate · Apr 11, 2023 · df48e1a · df48e1a
1 parent 0b3d1ea
commit df48e1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/resources/vm_qemu.md b/docs/resources/vm_qemu.md
@@ -53,7 +53,7 @@ boot of the VM.  A minimal Resource stanza for a PXE boot VM might look like thi
 resource "proxmox_vm_qemu" "pxe-minimal-example" {
     name                      = "pxe-minimal-example"
     agent                     = 0
-    boot                      = "order=net0;scsi0"
+    boot                      = "order=scsi0;net0"
     pxe                       = true
     target_node               = "test"
     network {
@@ -67,7 +67,7 @@ resource "proxmox_vm_qemu" "pxe-minimal-example" {
 
 The primary options that effect the correct operation of Network PXE boot mode are:
 
-  * `boot`: a valid boot order must be specified with Network type included (eg `order=net0;scsi0`)
+  * `boot`: a valid boot order must be specified with Network type included (eg `order=scsi0;net0`)
   * a valid NIC attached to a network with a PXE boot server must be added to the VM
   * generally speaking, disable the Agent (`agent = 0`) unless the installed OS contains the Agent in OS install configurations
 
@@ -96,7 +96,7 @@ The following arguments are supported in the top level resource block.
 | `bootdisk`                    | `str`  |                      | Enable booting from specified disk. You shouldn't need to change it under most circumstances.                                                                                                                                                                                                                               |
 | `agent`                       | `int`  | `0`                  | Set to `1` to enable the QEMU Guest Agent. Note, you must run the [`qemu-guest-agent`](https://pve.proxmox.com/wiki/Qemu-guest-agent) daemon in the guest for this to have any effect.                                                                                                                                      |
 | `iso`                         | `str`  |                      | The name of the ISO image to mount to the VM in the format: [storage pool]:iso/[name of iso file]. Only applies when `clone` is not set. Either `clone` or `iso` needs to be set.  Note that `iso` is mutually exclussive with `clone` and `pxe` modes.                                                                                                                          |
-| `pxe`                         | `bool` | `false`              | If set to `true`, enable PXE boot of the VM.  Also requires a `boot` order be set with Network included (eg `boot = "order=net0;scsi0"`).  Note that `pxe` is mutually exclusive with `iso` and `clone` modes.                                                                                                                      |
+| `pxe`                         | `bool` | `false`              | If set to `true`, enable PXE boot of the VM.  Also requires a `boot` order be set with Network included (eg `boot = "order=scsi0;net0"`).  Note that `pxe` is mutually exclusive with `iso` and `clone` modes.                                                                                                                      |
 | `clone`                       | `str`  |                      | The base VM from which to clone to create the new VM.  Note that `clone` is mutually exclussive with `pxe` and `iso` modes.                                                                                                                                                                                                 |
 | `full_clone`                  | `bool` | `true`               | Set to `true` to create a full clone, or `false` to create a linked clone. See the [docs about cloning](https://pve.proxmox.com/pve-docs/chapter-qm.html#qm_copy_and_clone) for more info. Only applies when `clone` is set.                                                                                                |
 | `hastate`                     | `str`  |                      | Requested HA state for the resource. One of "started", "stopped", "enabled", "disabled", or "ignored". See the [docs about HA](https://pve.proxmox.com/pve-docs/chapter-ha-manager.html#ha_manager_resource_config) for more info.                                                                                          |

diff --git a/proxmox/resource_vm_qemu_test.go b/proxmox/resource_vm_qemu_test.go
@@ -96,7 +96,7 @@ resource "proxmox_vm_qemu" "%s" {
   name = "%s"
   target_node = "%s"
 	pxe = true
-	boot = "order=net0;scsi0"
+	boot = "order=scsi0;net0"
 	network {
     bridge    = "vmbr0"
     firewall  = false