Skip to content

GitLab

Commit 7caee4b9 authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

images: enable fall back to tcg for qemu if no kvm support

parent e0f613fa
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
images/extended-image.pkr.hcl
View file @ 7caee4b9
...@@ -29,7 +29,7 @@ source "qemu" "autogenerated_1" { ...@@ -29,7 +29,7 @@ source "qemu" "autogenerated_1" {
memory = "${var.memory}" memory = "${var.memory}"
net_device = "virtio-net" net_device = "virtio-net"
output_directory = "output-${var.outname}" output_directory = "output-${var.outname}"
qemuargs = [["-machine", "pc-q35-4.2,accel=kvm,usb=off,vmport=off,dump-guest-core=off"]] qemuargs = [["-machine", "pc-q35-4.2,accel=kvm:tcg,usb=off,vmport=off,dump-guest-core=off"]]
shutdown_command = "sudo shutdown --poweroff --no-wall now" shutdown_command = "sudo shutdown --poweroff --no-wall now"
ssh_password = "ubuntu" ssh_password = "ubuntu"
ssh_username = "ubuntu" ssh_username = "ubuntu"
......
images/ubuntu1804.json
View file @ 7caee4b9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"iso_url": "https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img", "iso_url": "https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img",
"qemuargs": [ "qemuargs": [
["-smbios", "type=1,serial=ds=nocloud-net;instance-id=packer;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/"], ["-smbios", "type=1,serial=ds=nocloud-net;instance-id=packer;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/"],
["-machine","pc-q35-4.2,accel=kvm,usb=off,vmport=off,dump-guest-core=off"] ["-machine","pc-q35-4.2,accel=kvm:tcg,usb=off,vmport=off,dump-guest-core=off"]
], ],
"http_directory": "scripts", "http_directory": "scripts",
"ssh_username": "ubuntu", "ssh_username": "ubuntu",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment