Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issues 257, 263, 187, 80] - AsyncIO disk config support, ISO Storage uplift #267

Merged
merged 13 commits into from
Sep 26, 2024
Merged

[Issues 257, 263, 187, 80] - AsyncIO disk config support, ISO Storage uplift #267

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13a0b51
common: add disk config asyncio setting
mpywell May 29, 2024
6fdbe8a
common: change iso unmount device default behaviour
mpywell May 29, 2024
a78726c
iso: add iso_device config option
mpywell May 31, 2024
064a8b5
fix: replace ide2 static references in finalize_iso
mpywell Jun 1, 2024
7b4fd64
fix: code quality updates
mpywell Jun 4, 2024
99efad8
consolidate iso device configuration
mpywell Jun 12, 2024
a52fd9c
iso: update basic example documentation with iso block
mpywell Jun 13, 2024
6b51d75
iso: reintroduce iso config struct for boot iso
mpywell Jun 20, 2024
e635f0e
common: update documentation of ISOsConfig Type field
mpywell Jun 20, 2024
8370873
common: restore default disk backup behaviour
mpywell Jul 15, 2024
80edb15
add backwards compatibility support for ISOs
mpywell Sep 18, 2024
b51baca
Improve tests, update doc
mpywell Sep 24, 2024
bfa19d5
test all buses for overallocation, cleanup test bool conditions
mpywell Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 43 additions & 21 deletions .web-docs/components/builder/clone/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ boot time.
- `cloud_init_disk_type` (string) - The type of Cloud-Init disk. Can be `scsi`, `sata`, or `ide`
Defaults to `ide`.

- `additional_iso_files` ([]additionalISOsConfig) - Additional ISO files attached to the virtual machine.
See [Additional ISO Files](#additional-iso-files).
- `additional_iso_files` ([]ISOsConfig) - ISO files attached to the virtual machine.
See [ISOs](#isos).

- `vm_interface` (string) - Name of the network interface that Packer gets
the VMs IP from. Defaults to the first non loopback interface.
Expand Down Expand Up @@ -444,6 +444,12 @@ Example:
multiple disks are used. Requires `virtio-scsi-single` controller and a
`scsi` or `virtio` disk. Defaults to `false`.

- `asyncio` (string) - Configure Asynchronous I/O. Can be `native`, `threads`, or `io_uring`.
Defaults to io_uring.

- `exclude_from_backup` (bool) - Exclude disk from Proxmox backup jobs
Defaults to false.

- `discard` (bool) - Relay TRIM commands to the underlying storage. Defaults
to false. See the
[Proxmox documentation](https://pve.proxmox.com/pve-docs/pve-admin-guide.html#qm_hard_disk_discard)
Expand Down Expand Up @@ -495,28 +501,40 @@ Usage example (JSON):
<!-- End of code generated from the comments of the cloudInitIpconfig struct in builder/proxmox/clone/config.go; -->


### Additional ISO Files
### ISO Files

<!-- Code generated from the comments of the additionalISOsConfig struct in builder/proxmox/common/config.go; DO NOT EDIT MANUALLY -->
<!-- Code generated from the comments of the ISOsConfig struct in builder/proxmox/common/config.go; DO NOT EDIT MANUALLY -->

Additional ISO files attached to the virtual machine.
ISO files attached to the virtual machine.

Example:
JSON Example:

```json
[

{
"device": "scsi5",
"iso_file": "local:iso/virtio-win-0.1.185.iso",
"unmount": true,
"iso_checksum": "af2b3cc9fa7905dea5e58d31508d75bba717c2b0d5553962658a47aebc9cc386"
"additional_iso_files": [
{
"type": "scsi",
"iso_file": "local:iso/virtio-win-0.1.185.iso",
"unmount": true,
"iso_checksum": "af2b3cc9fa7905dea5e58d31508d75bba717c2b0d5553962658a47aebc9cc386"
}
]

```
HCL2 example:

```hcl

additional_iso_files {
type = "scsi"
iso_file = "local:iso/virtio-win-0.1.185.iso"
unmount = true
iso_checksum = "af2b3cc9fa7905dea5e58d31508d75bba717c2b0d5553962658a47aebc9cc386"
}

]
```

<!-- End of code generated from the comments of the additionalISOsConfig struct in builder/proxmox/common/config.go; -->
<!-- End of code generated from the comments of the ISOsConfig struct in builder/proxmox/common/config.go; -->


<!-- Code generated from the comments of the ISOConfig struct in multistep/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
Expand Down Expand Up @@ -651,13 +669,14 @@ In HCL2:
<!-- End of code generated from the comments of the ISOConfig struct in multistep/commonsteps/iso_config.go; -->


<!-- Code generated from the comments of the additionalISOsConfig struct in builder/proxmox/common/config.go; DO NOT EDIT MANUALLY -->
<!-- Code generated from the comments of the ISOsConfig struct in builder/proxmox/common/config.go; DO NOT EDIT MANUALLY -->

- `device` (string) - Bus type and bus index that the ISO will be mounted on. Can be `ideX`,
`sataX` or `scsiX`.
For `ide` the bus index ranges from 0 to 3, for `sata` from 0 to 5 and for
`scsi` from 0 to 30.
Defaults to `ide3` since `ide2` is generally the boot drive.
- `type` (string) - Bus type that the ISO will be mounted on. Can be `ide`, `sata` or `scsi`. Defaults to `ide`.

In v1.9 bus indexes are no longer accepted for ISOs. ISOs are now attached to VMs in the order
they are configured, using free bus indexes after disks are attached.
Example: if two Disks and one ISO are defined as type `sata`, the disks will be attached to the VM
as `sata0`, `sata1`, and the ISO will be mapped to `sata2` (the next free device index)

- `iso_file` (string) - Path to the ISO file to boot from, expressed as a
proxmox datastore path, for example
Expand All @@ -673,7 +692,10 @@ In HCL2:

- `unmount` (bool) - If true, remove the mounted ISO from the template after finishing. Defaults to `false`.

<!-- End of code generated from the comments of the additionalISOsConfig struct in builder/proxmox/common/config.go; -->
- `keep_cdrom_device` (bool) - Keep CDRom device attached to template if unmounting ISO. Defaults to `false`.
Has no effect if unmount is `false`

<!-- End of code generated from the comments of the ISOsConfig struct in builder/proxmox/common/config.go; -->


<!-- Code generated from the comments of the CDConfig struct in multistep/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
Expand Down
Loading