Skip to content

Commit

Permalink
Rename to qemu_additional_args
Browse files Browse the repository at this point in the history
  • Loading branch information
rhpijnacker authored and lbajolet-hashicorp committed Jan 11, 2024
1 parent 71ba41b commit b872d36
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
7 changes: 4 additions & 3 deletions .web-docs/components/builder/clone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ boot time.
- `tags` (string) - The tags to set. This is a semicolon separated list. For example,
`debian-12;template`.

- `args` (string) - Arbitrary arguments passed to KVM. For example `-no-reboot -smbios type=0,vendor=FOO`.
Note: this option is for experts only.

- `boot` (string) - Override default boot order. Format example `order=virtio0;ide2;net0`.
Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network)

Expand Down Expand Up @@ -275,6 +272,10 @@ boot time.
- `vm_interface` (string) - Name of the network interface that Packer gets
the VMs IP from. Defaults to the first non loopback interface.

- `qemu_additional_args` (string) - Arbitrary arguments passed to KVM.
For example `-no-reboot -smbios type=0,vendor=FOO`.
Note: this option is for experts only.

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


Expand Down
7 changes: 4 additions & 3 deletions .web-docs/components/builder/iso/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ in the image's Cloud-Init settings for provisioning.
- `tags` (string) - The tags to set. This is a semicolon separated list. For example,
`debian-12;template`.

- `args` (string) - Arbitrary arguments passed to KVM. For example `-no-reboot -smbios type=0,vendor=FOO`.
Note: this option is for experts only.

- `boot` (string) - Override default boot order. Format example `order=virtio0;ide2;net0`.
Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network)

Expand Down Expand Up @@ -206,6 +203,10 @@ in the image's Cloud-Init settings for provisioning.
- `vm_interface` (string) - Name of the network interface that Packer gets
the VMs IP from. Defaults to the first non loopback interface.

- `qemu_additional_args` (string) - Arbitrary arguments passed to KVM.
For example `-no-reboot -smbios type=0,vendor=FOO`.
Note: this option is for experts only.

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


Expand Down
4 changes: 2 additions & 2 deletions builder/proxmox/clone/config.hcl2spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions builder/proxmox/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ type Config struct {
// `debian-12;template`.
Tags string `mapstructure:"tags"`

// Arbitrary arguments passed to KVM. For example
// `-no-reboot -smbios type=0,vendor=FOO`.
// Note: this option is for experts only.
Args string `mapstructure:"args"`
// Override default boot order. Format example `order=virtio0;ide2;net0`.
// Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network)
Boot string `mapstructure:"boot"`
Expand Down Expand Up @@ -195,6 +191,11 @@ type Config struct {
// the VMs IP from. Defaults to the first non loopback interface.
VMInterface string `mapstructure:"vm_interface"`

// Arbitrary arguments passed to KVM.
// For example `-no-reboot -smbios type=0,vendor=FOO`.
// Note: this option is for experts only.
AdditionalArgs string `mapstructure:"qemu_additional_args"`

Ctx interpolate.Context `mapstructure-to-hcl2:",skip"`
}

Expand Down
2 changes: 1 addition & 1 deletion builder/proxmox/common/config.hcl2spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion builder/proxmox/common/step_start_vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist
Agent: agent,
QemuKVM: &kvm,
Tags: c.Tags,
Args: c.Args,
Boot: c.Boot, // Boot priority, example: "order=virtio0;ide2;net0", virtio0:Disk0 -> ide0:CDROM -> net0:Network
QemuCpu: c.CPUType,
Description: "Packer ephemeral build VM",
Expand All @@ -134,6 +133,7 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist
QemuSerials: generateProxmoxSerials(c.Serials),
Scsihw: c.SCSIController,
Onboot: &c.Onboot,
Args: c.AdditionalArgs,
}

// 0 disables the ballooning device, which is useful for all VMs
Expand Down
4 changes: 2 additions & 2 deletions builder/proxmox/iso/config.hcl2spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b872d36

Please sign in to comment.