Multiply updates
* Fix output processing
for predictable qemu artifact naming
* install-recommends=false for ubuntu16
* add zerofree for lvm case
* Fix PACKER_ARGS pass
Change-Id: I023b73963aeb7c1d562dbc6b1e414363de913d90
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 7b87e75..6ffd6dd 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -29,30 +29,6 @@
"SALTSTACK_REPO={{ user `saltstack_repo` }}"
],
"override": {
- "virtualbox-iso": {
- "scripts": [
- "scripts/base.sh",
- "scripts/motd.sh",
- "scripts/salt.sh",
- "scripts/network.sh",
- "scripts/vagrant.sh",
- "scripts/virtualbox.sh",
- "scripts/security.sh",
- "scripts/cleanup.sh",
- "scripts/zerodisk.sh"
- ]
- },
- "vmware-iso": {
- "scripts": [
- "scripts/base.sh",
- "scripts/motd.sh",
- "scripts/salt.sh",
- "scripts/vmware.sh",
- "scripts/security.sh",
- "scripts/cleanup.sh",
- "scripts/zerodisk.sh"
- ]
- },
"qemu": {
"scripts": [
"scripts/base.sh",
@@ -76,24 +52,6 @@
"scripts/info.sh",
"scripts/zerodisk.sh"
]
- },
- "docker": {
- "scripts": [
- "scripts/docker.sh",
- "scripts/base.sh",
- "scripts/motd.sh",
- "scripts/salt.sh",
- "scripts/cleanup.sh"
- ]
- },
- "digitalocean": {
- "scripts": [
- "scripts/base.sh",
- "scripts/motd.sh",
- "scripts/salt.sh",
- "scripts/security.sh",
- "scripts/cleanup.sh"
- ]
}
}
},
@@ -108,171 +66,8 @@
"destination": "/usr/bin"
}
],
- "post-processors": [
- {
- "type": "vagrant",
- "keep_input_artifact": true,
- "output": "images/{{ user `image_name` }}-{{.Provider}}-{{ isotime \"200601021504\" }}.box",
- "except": [
- "digitalocean",
- "docker"
- ]
- },
- {
- "type": "docker-tag",
- "repository": "tcpcloud/ubuntu",
- "tag": "16.04",
- "only": [
- "docker"
- ]
- },
- {
- "type": "docker-save",
- "path": "images/{{ user `image_name` }}-docker-{{ isotime \"200601021504\" }}.tar",
- "only": [
- "docker"
- ]
- }
- ],
"builders": [
{
- "type": "virtualbox-iso",
- "boot_command": [
- "<esc><wait>",
- "<esc><wait>",
- "<enter><wait>",
- "/install/vmlinuz<wait>",
- " auto<wait>",
- " console-setup/ask_detect=false<wait>",
- " console-setup/layoutcode=us<wait>",
- " console-setup/modelcode=pc105<wait>",
- " debconf/frontend=noninteractive<wait>",
- " debian-installer=en_US<wait>",
- " fb=false<wait>",
- " initrd=/install/initrd.gz<wait>",
- " kbd-chooser/method=us<wait>",
- " keyboard-configuration/layout=USA<wait>",
- " keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{ user `password` }} ",
- " passwd/root-password-again={{ user `password` }} ",
- " locale=en_US<wait>",
- " netcfg/get_hostname=ubuntu<wait>",
- " netcfg/get_domain=local<wait>",
- " noapic<wait>",
- " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
- " -- <wait>",
- "<enter><wait>"
- ],
- "boot_wait": "5s",
- "disk_size": "{{ user `disk_size`}}",
- "output_directory": "images/{{ user `image_name`}}",
- "guest_os_type": "Ubuntu_64",
- "http_directory": "http",
- "iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
- "iso_checksum_type": "md5",
- "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.3-server-amd64.iso",
- "ssh_username": "{{ user `user` }}",
- "ssh_password": "{{ user `password` }}",
- "ssh_port": 22,
- "ssh_wait_timeout": "10000s",
- "shutdown_command": "shutdown -P now",
- "headless": true,
- "vboxmanage": [
- [
- "modifyvm",
- "{{.Name}}",
- "--memory",
- "1024"
- ],
- [
- "modifyvm",
- "{{.Name}}",
- "--cpus",
- "2"
- ],
- [
- "modifyvm",
- "{{.Name}}",
- "--vrde",
- "on"
- ],
- [
- "modifyvm",
- "{{.Name}}",
- "--vrdeport",
- "5000-5050"
- ],
- [
- "modifyvm",
- "{{.Name}}",
- "--vrdeaddress",
- "127.0.0.1"
- ]
- ]
- },
- {
- "type": "vmware-iso",
- "boot_command": [
- "<esc><wait>",
- "<esc><wait>",
- "<enter><wait>",
- "/install/vmlinuz<wait>",
- " auto<wait>",
- " console-setup/ask_detect=false<wait>",
- " console-setup/layoutcode=us<wait>",
- " console-setup/modelcode=pc105<wait>",
- " debconf/frontend=noninteractive<wait>",
- " debian-installer=en_US<wait>",
- " fb=false<wait>",
- " initrd=/install/initrd.gz<wait>",
- " kbd-chooser/method=us<wait>",
- " keyboard-configuration/layout=USA<wait>",
- " keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{user `password`}} ",
- " passwd/root-password-again={{user `password`}} ",
- " locale=en_US<wait>",
- " netcfg/get_hostname=ubuntu<wait>",
- " netcfg/get_domain=local<wait>",
- " noapic<wait>",
- " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
- " -- <wait>",
- "<enter><wait>"
- ],
- "boot_wait": "5s",
- "disk_size": "{{ user `disk_size`}}",
- "disk_type_id": 4,
- "vmdk_name": "{{ user `image_name`}}",
- "output_directory": "images/{{ user `image_name`}}",
- "guest_os_type": "linux",
- "http_directory": "http",
- "iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
- "iso_checksum_type": "md5",
- "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.3-server-amd64.iso",
- "ssh_username": "{{user `user`}}",
- "ssh_password": "{{user `password`}}",
- "ssh_port": 22,
- "ssh_wait_timeout": "10000s",
- "shutdown_command": "shutdown -P now",
- "vmx_data": {
- "memsize": "1024",
- "numvcpus": "1",
- "cpuid.coresPerSocket": "1"
- }
- },
- {
- "type": "docker",
- "image": "ubuntu:16.04",
- "commit": true
- },
- {
- "type": "digitalocean",
- "api_token": "{{user `do_api_token`}}",
- "image": "{{user `image_name`}}",
- "snapshot_name": "{{ user `image_name` }}-{{ isotime \"200601021504\" }}",
- "region": "ams2",
- "size": "1gb"
- },
- {
"type": "qemu",
"qemuargs": [
["-m", "1024M"],
@@ -280,11 +75,12 @@
["-object","rng-random,id=objrng0,filename=/dev/urandom"],
["-device", "virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x10"]
],
- "vm_name": "{{ user `image_name` }}",
- "output_directory": "images/{{ user `image_name`}}",
+ "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\" }}.qcow2",
+ "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\" }}",
+ "disk_compression": true,
+ "disk_size": "{{ user `disk_size`}}",
"boot_key_interval": "50ms",
"accelerator": "kvm",
- "disk_size": "{{ user `disk_size`}}",
"iso_checksum": "24636fd103a2a43c95659f1c3c63718e",
"iso_checksum_type": "md5",
"iso_url": "http://releases.ubuntu.com/16.04.5/ubuntu-16.04.5-server-amd64.iso",