From 45017de065f5ecb70c2b226793b91b3a02cd6fd5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 25 Oct 2019 13:29:18 +0200 Subject: ubuntu-18.04-amd64.json: update to 18.04.3 + formating --- ubuntu-18.04-amd64.json | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ubuntu-18.04-amd64.json b/ubuntu-18.04-amd64.json index f26e6b7..0e67bfd 100644 --- a/ubuntu-18.04-amd64.json +++ b/ubuntu-18.04-amd64.json @@ -1,26 +1,32 @@ { "variables": { - "iso_url":"http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-amd64.iso", - "iso_checksum_url": "http://cdimage.ubuntu.com/releases/18.04/release/SHA256SUMS", + "iso_base_url": "http://cdimage.ubuntu.com/releases/18.04/release", + "iso_url": "{{ user `iso_base_url` }}/ubuntu-18.04.3-server-amd64.iso", + "iso_checksum_url": "{{ user `iso_base_url` }}/SHA256SUMS", "iso_checksum_type": "sha256", - "vm_name": "ubuntu-18.04-amd64", - "http_dir": "http", - "preseed_path": "ubuntu-18.04/preseed.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password":"{{ env `ROOTPW` }}" + "vm_name": "ubuntu-18.04-amd64", + "http_dir": "http", + "preseed_path": "ubuntu-18.04/preseed.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "{{ env `ROOTPW` }}" }, "builders": [{ - "type": "qemu", - "accelerator": "kvm", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum_url": "{{ user `iso_checksum_url` }}", + "type": "qemu", + "accelerator": "kvm", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum_url": "{{ user `iso_checksum_url` }}", "iso_checksum_type": "{{ user `iso_checksum_type` }}", - "output_directory": "{{ user `output_directory` }}", - "vm_name": "{{ user `vm_name` }}", - "disk_size": "{{ user `disk_size` }}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", + "output_directory": "{{ user `output_directory` }}", + "vm_name": "{{ user `vm_name` }}", + "disk_size": "{{ user `disk_size` }}", + "format": "qcow2", + "headless": "{{ user `headless` }}", + "boot_wait": "5s", + "ssh_timeout": "{{user `ssh_timeout`}}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "{{ user `shutdown_command` }}", + "http_directory": "{{ user `http_dir` }}", "boot_command": [ "", "", @@ -41,11 +47,6 @@ "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ", "" ], - "boot_wait": "5s", - "ssh_timeout": "{{user `ssh_timeout`}}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", "qemuargs": [ ["-cpu", "host"], ["-m", "{{user `memory`}}"], -- cgit v1.2.3-55-g7522 From 983ceabcc2658d9553ee3847464190967993e462 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 25 Oct 2019 13:31:29 +0200 Subject: ubuntu-18.04-amd64.json: remove virtualbox/vmware --- ubuntu-18.04-amd64.json | 80 ------------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/ubuntu-18.04-amd64.json b/ubuntu-18.04-amd64.json index 0e67bfd..d6fe644 100644 --- a/ubuntu-18.04-amd64.json +++ b/ubuntu-18.04-amd64.json @@ -52,86 +52,6 @@ ["-m", "{{user `memory`}}"], ["-smp", "{{user `cpus`}}"] ] - }, { - "type": "virtualbox-iso", - "guest_os_type": "Ubuntu_64", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum_url": "{{ user `iso_checksum_url` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", - "output_directory": "{{ user `output_directory` }}", - "vm_name": "{{ user `vm_name` }}", - "disk_size": "{{ user `disk_size` }}", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "boot_command": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "initrd=/install/initrd.gz ", - "auto=true ", - "passwd/root-password={{ user `ssh_password` }} ", - "passwd/root-password-again={{ user `ssh_password` }} ", - "debconf/priority=critical ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ", - "" - ], - "boot_wait": "5s", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "vboxmanage": [ - ["modifyvm", "{{ .Name }}", "--memory", "{{ user `memory` }}"], - ["modifyvm", "{{ .Name }}", "--cpus", "{{ user `cpus` }}"] - ] - }, { - "type": "vmware-iso", - "guest_os_type": "ubuntu-64", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum_url": "{{ user `iso_checksum_url` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", - "output_directory": "{{ user `output_directory` }}", - "vm_name": "{{ user `vm_name` }}", - "disk_size": "{{ user `disk_size` }}", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "boot_command": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "initrd=/install/initrd.gz ", - "auto=true ", - "passwd/root-password={{ user `ssh_password` }} ", - "passwd/root-password-again={{ user `ssh_password` }} ", - "debconf/priority=critical ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `preseed_path` }} ", - "" - ], - "boot_wait": "5s", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "vmx_data": { - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } }], "provisioners": [{ "type": "ansible", -- cgit v1.2.3-55-g7522