Skip to content

Commit

Permalink
Removed explicit QEMU args in favor of new Packer config flags.
Browse files Browse the repository at this point in the history
  • Loading branch information
ladar committed Nov 10, 2020
1 parent ca7de25 commit 45d9ca5
Show file tree
Hide file tree
Showing 7 changed files with 165 additions and 451 deletions.
8 changes: 2 additions & 6 deletions developer-libvirt.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,14 @@
"format": "qcow2",
"disk_size": "131072",
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"disk_cache": "unsafe",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 4,
"memory": 4096,
"qemuargs": [
[
"-drive",
"if=none,file=output/magma-developer-libvirt/magma-developer-libvirt,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
Expand Down
56 changes: 19 additions & 37 deletions generic-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,10 @@
"format": "raw",
"disk_size": "32770",
"disk_interface": "virtio-scsi",
"disk_compression": true,
"disk_image": false,
"disk_compression": true,
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
Expand Down Expand Up @@ -301,8 +303,10 @@
"format": "raw",
"disk_size": "32770",
"disk_interface": "virtio-scsi",
"disk_compression": true,
"disk_image": false,
"disk_compression": true,
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
Expand Down Expand Up @@ -330,8 +334,10 @@
"format": "raw",
"disk_size": "32770",
"disk_interface": "virtio-scsi",
"disk_compression": true,
"disk_image": false,
"disk_compression": true,
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
Expand Down Expand Up @@ -359,18 +365,14 @@
"format": "qcow2",
"disk_size": "32768",
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"disk_cache": "unsafe",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-oracle7-docker/generic-oracle7-docker,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_url": "https://mirrors.kernel.org/oracle/OL7/u8/x86_64/OracleLinux-R7-U8-Server-x86_64-dvd.iso",
Expand All @@ -395,18 +397,13 @@
"format": "qcow2",
"disk_size": "32768",
"disk_discard": "unmap",
"disk_cache": "unsafe",
"disk_detect_zeroes": "unmap",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-oracle8-docker/generic-oracle8-docker,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_url": "https://mirrors.kernel.org/oracle/OL8/u2/x86_64/OracleLinux-R8-U2-x86_64-dvd.iso",
Expand All @@ -431,18 +428,13 @@
"format": "qcow2",
"disk_size": "32768",
"disk_discard": "unmap",
"disk_cache": "unsafe",
"disk_detect_zeroes": "unmap",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-rhel6-docker/generic-rhel6-docker,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_url": "https://archive.org/download/rhel-server-6.10-x86_64-dvd/rhel-server-6.10-x86_64-dvd.iso",
Expand All @@ -467,18 +459,13 @@
"format": "qcow2",
"disk_size": "32768",
"disk_discard": "unmap",
"disk_cache": "unsafe",
"disk_detect_zeroes": "unmap",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-rhel7-docker/generic-rhel7-docker,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_urls": "https://archive.org/download/rhel-server-7.8-x86_64-dvd/rhel-server-7.8-x86_64-dvd.iso",
Expand All @@ -503,18 +490,13 @@
"format": "qcow2",
"disk_size": "32768",
"disk_discard": "unmap",
"disk_cache": "unsafe",
"disk_detect_zeroes": "unmap",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-rhel8-docker/generic-rhel8-docker,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_urls": "https://archive.org/download/rhel-8.2-x86_64-dvd/rhel-8.2-x86_64-dvd.iso",
Expand Down
8 changes: 2 additions & 6 deletions generic-libvirt-x32.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,14 @@
"format": "qcow2",
"disk_size": "131072",
"disk_discard": "unmap",
"disk_detect_zeroes": "unmap",
"disk_cache": "unsafe",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"qemuargs": [
[
"-drive",
"if=none,file=output/generic-debian9-x32-libvirt/generic-debian9-x32-libvirt,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
]
],
"http_directory": "http",
"headless": true,
"iso_url": "https://ftp.acc.umu.se/mirror/cdimage/archive/9.13.0/i386/iso-cd/debian-9.13.0-i386-netinst.iso",
Expand Down
Loading

0 comments on commit 45d9ca5

Please sign in to comment.