packer: update all json files with "packer fix"

For info, this is the command used: for f in *.json; do packer fix -validate $f > $f.fix || echo "$f FAILED" ; mv $f.fix $f ; done

packer: update all json files with "packer fix"
For info, this is the command used: for f in *.json; do packer fix -validate $f > $f.fix || echo "$f FAILED" ; mv $f.fix $f ; done
f71fb6e4 · Thomas Gambier · f70c5397 · f71fb6e4 · f71fb6e4 · f71fb6e4
Commit f71fb6e4 authored Oct 31, 2022 by Thomas Gambier
25 changed files
--- a/packer/centos-6.7-testing-version.json
+++ b/packer/centos-6.7-testing-version.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "centos67-testing-version",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://mirrors.kernel.org/centos/6.7/isos/x86_64/CentOS-6.7-x86_64-minimal.iso",
-      "iso_checksum": "9d3fec5897be6b3fed4d3dda80b8fa7bb62c616bbfd4bdcd27295ca9b764f498",
-      "iso_checksum_type": "sha256",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos67-anaconda-ks.cfg",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "sha256:9d3fec5897be6b3fed4d3dda80b8fa7bb62c616bbfd4bdcd27295ca9b764f498",
+      "iso_url": "http://mirrors.kernel.org/centos/6.7/isos/x86_64/CentOS-6.7-x86_64-minimal.iso",
+      "name": "centos67-testing-version",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
        "scripts/packages-centos.sh",
        "scripts/setup-testing-version.sh",
        "scripts/cleanup-centos.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-6.7-vm-boostrap.json
+++ b/packer/centos-6.7-vm-boostrap.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "200000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "centos68-vm-bootstrap",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://mirrors.kernel.org/centos/6.8/isos/x86_64/CentOS-6.8-x86_64-minimal.iso",
-      "iso_checksum": "0ca12fe5f28c2ceed4f4084b41ff8a0b",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos67-anaconda-ks.cfg",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:0ca12fe5f28c2ceed4f4084b41ff8a0b",
+      "iso_url": "http://mirrors.kernel.org/centos/6.8/isos/x86_64/CentOS-6.8-x86_64-minimal.iso",
+      "name": "centos68-vm-bootstrap",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
@@ -49,7 +32,15 @@
        "scripts/cleanup-centos.sh",
        "scripts/centos6-install-base.sh",
        "scripts/vm-bootstrap.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "200000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-6.7.json
+++ b/packer/centos-6.7.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "centos-6-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "http://mirrors.kernel.org/centos/6.8/isos/x86_64/CentOS-6.8-x86_64-minimal.iso",
-      "iso_checksum": "0ca12fe5f28c2ceed4f4084b41ff8a0b",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos67-anaconda-ks.cfg",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:0ca12fe5f28c2ceed4f4084b41ff8a0b",
+      "iso_url": "http://mirrors.kernel.org/centos/6.8/isos/x86_64/CentOS-6.8-x86_64-minimal.iso",
+      "name": "centos-6-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
@@ -51,8 +32,17 @@
        "scripts/cleanup-centos.sh",
        "scripts/centos6-install-base.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-7-testing-version.json
+++ b/packer/centos-7-testing-version.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "centos7-testing-version",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
-      "iso_checksum": "fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
-      "iso_checksum_type": "sha256",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos7-anaconda-ks.cfg biosdevname=0 net.ifnames=0",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "sha256:fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
+      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
+      "name": "centos7-testing-version",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
        "scripts/packages-centos.sh",
        "scripts/setup-testing-version.sh",
        "scripts/cleanup-centos.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-7-vm-bootstrap.json
+++ b/packer/centos-7-vm-bootstrap.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "200000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "centos7-vm-bootstrap",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
-      "iso_checksum": "fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
-      "iso_checksum_type": "sha256",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos72-anaconda-ks.cfg biosdevname=0 net.ifnames=0",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "sha256:fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
+      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
+      "name": "centos7-vm-bootstrap",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
@@ -48,7 +32,15 @@
        "scripts/cleanup-centos.sh",
        "scripts/centos7-install-base.sh",
        "scripts/vm-bootstrap.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "200000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-7.json
+++ b/packer/centos-7.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "centos7-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
-      "iso_checksum": "fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
-      "iso_checksum_type": "sha256",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc>",
        "<wait>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos7-anaconda-ks.cfg biosdevname=0 net.ifnames=0",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "sha256:fe3d960cce4d2c1c9f1b66817fe87cc0ee1a1c6c5dd126204cb5c33d51a45620",
+      "iso_url": "http://mirrors.kernel.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1708.iso",
+      "name": "centos7-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
@@ -50,8 +32,17 @@
        "scripts/cleanup-centos.sh",
        "scripts/centos7-install-base.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/centos-8.json
+++ b/packer/centos-8.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "centos8-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "http://mirrors.ircam.fr/pub/CentOS/8.1.1911/isos/x86_64/CentOS-8.1.1911-x86_64-dvd1.iso",
-      "iso_checksum": "3ee3f4ea1538e026fff763e2b284a6f20b259d91d1ad5688f5783a67d279423b",
-      "iso_checksum_type": "sha256",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo poweroff",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<tab>",
        "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos7-anaconda-ks.cfg biosdevname=0 net.ifnames=0",
        "<enter>",
        "<wait>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "sha256:3ee3f4ea1538e026fff763e2b284a6f20b259d91d1ad5688f5783a67d279423b",
+      "iso_url": "http://mirrors.ircam.fr/pub/CentOS/8.1.1911/isos/x86_64/CentOS-8.1.1911-x86_64-dvd1.iso",
+      "name": "centos8-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "sudo poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-centos.sh",
@@ -50,8 +32,17 @@
        "scripts/cleanup-centos.sh",
        "scripts/centos7-install-base.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8-erp5-standalone.json
+++ b/packer/debian8-erp5-standalone.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "debian8-erp5-standalone",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -36,29 +9,45 @@
        "debian-installer=en_US locale=en_US keymap=us ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-erp5-standalone",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/setup-erp5-standalone.sh",
        "scripts/cleanup.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8-testing-version.json
+++ b/packer/debian8-testing-version.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "debian8-testing-version",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -36,29 +9,45 @@
        "debian-installer=en_US locale=en_US keymap=us ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-testing-version",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/setup-testing-version.sh",
        "scripts/cleanup.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8-vm-boostrap.json
+++ b/packer/debian8-vm-boostrap.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "200000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "debian8-vm-bootstrap",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -36,29 +9,45 @@
        "debian-installer=en_US locale=en_US keymap=fr ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-vm-bootstrap",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/cleanup.sh",
        "scripts/vm-bootstrap.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "200000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8-webrunner-standalone.json
+++ b/packer/debian8-webrunner-standalone.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "debian8-webrunner",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -36,29 +9,45 @@
        "debian-installer=en_US locale=en_US keymap=us ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-webrunner",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/setup-webrunner-standalone.sh",
        "scripts/cleanup.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8-wendelin-standalone.json
+++ b/packer/debian8-wendelin-standalone.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000",
-    "domain": ""
-  },
-  "builders":
-  [
    {
-      "name": "debian8-wendelin",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -36,29 +9,45 @@
        "debian-installer=en_US locale=en_US keymap=us ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-wendelin",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/setup-wendelin-standalone.sh",
        "scripts/cleanup.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "domain": "",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian8.json
+++ b/packer/debian8.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "debian8-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
-      "iso_checksum": "df0ce86d0b1d81e232ad08eef58754ed",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -38,30 +9,47 @@
        "debian-installer=en_US locale=en_US keymap=fr ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:df0ce86d0b1d81e232ad08eef58754ed",
+      "iso_url": "http://cdimage.debian.org/mirror/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso",
+      "name": "debian8-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
        "scripts/cleanup.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/debian9-rs-base.json
+++ b/packer/debian9-rs-base.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "6",
-    "name": "image",
-    "custom_script": "scripts/empty.sh",
-    "re6st_token": "{{env `RE6STTOKEN`}}",
-    "computer_token": "{{env `COMPUTERTOKEN`}}",
-    "computer_name": "{{env `COMPUTERNAME`}}"
-  },
-  "builders":
-  [
    {
-      "name": "debian9-rs-base-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "raw",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
-      "iso_checksum": "e494e78d531352f0f3fdb210f13f7577",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -41,24 +9,36 @@
        "debian-installer=en_US locale=en_US keymap=fr ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "raw",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:e494e78d531352f0f3fdb210f13f7577",
+      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
+      "name": "debian9-rs-base-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
+      "environment_vars": [
+        "re6st_token={{ user `re6st_token` }}",
+        "computer_name={{user `computer_name`}}",
+        "computer_token={{ user `computer_token` }}"
+      ],
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
-      "environment_vars": ["re6st_token={{ user `re6st_token` }}", "computer_name={{user `computer_name`}}", "computer_token={{ user `computer_token` }}"],
      "scripts": [
        "scripts/update.sh",
        "scripts/packages.sh",
@@ -66,8 +46,20 @@
        "scripts/cleanup.sh",
        "scripts/setup-base-slapos.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "computer_name": "{{env `COMPUTERNAME`}}",
+    "computer_token": "{{env `COMPUTERTOKEN`}}",
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "6",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "re6st_token": "{{env `RE6STTOKEN`}}",
+    "user": "slapos"
+  }
 }
--- a/packer/debian9.json
+++ b/packer/debian9.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "debian9-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
-      "iso_checksum": "e494e78d531352f0f3fdb210f13f7577",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
-      "headless": true,
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait><wait>",
        "install auto ",
@@ -38,22 +9,30 @@
        "debian-installer=en_US locale=en_US keymap=fr ",
        "netcfg/get_hostname={{ .Name }} ",
        "netcfg/get_domain={{ user `domain`}} ",
        "fb=false debconf/frontend=noninteractive ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:e494e78d531352f0f3fdb210f13f7577",
+      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
+      "name": "debian9-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -h now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update.sh",
@@ -61,8 +40,17 @@
        "scripts/network-debian.sh",
        "scripts/cleanup.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-14.04-server-amd64-testing-version.json
+++ b/packer/ubuntu-14.04-server-amd64-testing-version.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-14-04-server-testing-version",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
-      "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=SKIP ",
        "keyboard-configuration/layout=USA ",
        "keyboard-configuration/variant=USA ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:2ac1f3e0de626e54d05065d6f549fa3a",
+      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
+      "name": "ubuntu-14-04-server-testing-version",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/setup-testing-version.sh",
        "scripts/network-ubuntu.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-14.04-server-amd64-vm-bootstrap.json
+++ b/packer/ubuntu-14.04-server-amd64-vm-bootstrap.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-14-04-server-vm-bootstrap",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
-      "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=SKIP ",
        "keyboard-configuration/layout=USA ",
        "keyboard-configuration/variant=USA ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:2ac1f3e0de626e54d05065d6f549fa3a",
+      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
+      "name": "ubuntu-14-04-server-vm-bootstrap",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/network-ubuntu.sh",
        "scripts/vm-bootstrap.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-14.04-server-amd64.json
+++ b/packer/ubuntu-14.04-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-14-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
-      "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=fr ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=pc101 ",
        "keyboard-configuration/layoutcode=fr ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:2ac1f3e0de626e54d05065d6f549fa3a",
+      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
+      "name": "ubuntu-14-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/network-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-15.04-server-amd64-testing-version.json
+++ b/packer/ubuntu-15.04-server-amd64-testing-version.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-15-04-server-testing-version",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
-      "iso_checksum": "487f4a81f22f8597503db3d51a1b502e",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=SKIP ",
        "keyboard-configuration/layout=USA ",
        "keyboard-configuration/variant=USA ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:487f4a81f22f8597503db3d51a1b502e",
+      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
+      "name": "ubuntu-15-04-server-testing-version",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/setup-testing-version.sh",
        "scripts/network-ubuntu.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-15.04-server-amd64-vm-bootstrap.json
+++ b/packer/ubuntu-15.04-server-amd64-vm-bootstrap.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "disk_size": "100000"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-15-04-server-vm-bootstrap",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
-      "iso_checksum": "487f4a81f22f8597503db3d51a1b502e",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=SKIP ",
        "keyboard-configuration/layout=USA ",
        "keyboard-configuration/variant=USA ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:487f4a81f22f8597503db3d51a1b502e",
+      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
+      "name": "ubuntu-15-04-server-vm-bootstrap",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/network-ubuntu.sh",
        "scripts/vm-bootstrap.sh"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "disk_size": "100000",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-15.04-server-amd64.json
+++ b/packer/ubuntu-15.04-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-15-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
-      "iso_checksum": "487f4a81f22f8597503db3d51a1b502e",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu.cfg ",
        "debian-installer=en_US auto locale=en_US kbd-chooser/method=fr ",
        "hostname={{ .Name }} ",
        "keyboard-configuration/modelcode=pc101 ",
        "keyboard-configuration/layoutcode=fr ",
        "passwd/user-fullname={{user `user`}} ",
        "passwd/user-password-again={{user `password`}} ",
        "passwd/user-password={{user `password`}} ",
        "passwd/username={{user `user`}} ",
        "initrd=/install/initrd.gz -- <enter>"
-            ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:487f4a81f22f8597503db3d51a1b502e",
+      "iso_url": "http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso",
+      "name": "ubuntu-15-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/network-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-16.04-server-amd64.json
+++ b/packer/ubuntu-16.04-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-16.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.2-server-amd64.iso",
-      "iso_checksum": "2bce60d18248df9980612619ff0b34e6",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "sudo systemctl poweroff",
-      "boot_wait": "3s",
      "boot_command": [
        "<enter><wait>",
        "<f6><esc>",
@@ -56,21 +27,41 @@
        "noapic ",
        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu16.04.cfg ",
        "<enter>"
-      ]
+      ],
+      "boot_wait": "3s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:2bce60d18248df9980612619ff0b34e6",
+      "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.2-server-amd64.iso",
+      "name": "ubuntu-16.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "sudo systemctl poweroff",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/grub-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-16.10-server-amd64.json
+++ b/packer/ubuntu-16.10-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-16-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_url": "http://releases.ubuntu.com/16.10/ubuntu-16.10-server-amd64.iso",
-      "iso_checksum": "7d6de832aee348bacc894f0a2ab1170d",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><esc><enter><wait>",
        "/install/vmlinuz ",
@@ -46,21 +17,41 @@
        "noapic ",
        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu16.04.cfg ",
        "-- <enter>"
-      ]
+      ],
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:7d6de832aee348bacc894f0a2ab1170d",
+      "iso_url": "http://releases.ubuntu.com/16.10/ubuntu-16.10-server-amd64.iso",
+      "name": "ubuntu-16-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/grub-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-18.04-server-amd64.json
+++ b/packer/ubuntu-18.04-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "100",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-18.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_url": "http://cdimage.ubuntu.com/releases/18.04.1/release/ubuntu-18.04.1-server-amd64.iso",
-      "iso_checksum": "e8264fa4c417216f4304079bd94f895e",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait>",
        "<esc><wait>",
@@ -50,22 +21,41 @@
        "noapic ",
        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu18.04.cfg ",
        "-- <enter>"
+      ],
-      ]
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:e8264fa4c417216f4304079bd94f895e",
+      "iso_url": "http://cdimage.ubuntu.com/releases/18.04.1/release/ubuntu-18.04.1-server-amd64.iso",
+      "name": "ubuntu-18.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/packages-ubuntu.sh",
        "scripts/grub-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "100",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }
--- a/packer/ubuntu-20.04-server-amd64.json
+++ b/packer/ubuntu-20.04-server-amd64.json
 {
-  "variables": {
+  "builders": [
-    "user": "slapos",
-    "password": "slapos",
-    "domain": "",
-    "disk_size": "20",
-    "name": "image",
-    "custom_script": "scripts/empty.sh"
-  },
-  "builders":
-  [
    {
-      "name": "ubuntu-20.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
-      "type": "qemu",
-      "format": "qcow2",
      "accelerator": "kvm",
-      "disk_size": "{{ user `disk_size`}}000",
-      "headless": true,
-      "iso_checksum": "9d2b54506f8f9fdad6b72e45aff0f0de",
-      "iso_url": "http://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04/release/ubuntu-20.04-legacy-server-amd64.iso",
-      "iso_checksum_type": "md5",
-      "http_directory": "http",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
-      "ssh_wait_timeout": "1800s",
-      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
-      "boot_wait": "2s",
      "boot_command": [
        "<esc><wait>",
        "<esc><wait>",
@@ -50,21 +21,40 @@
        "noapic ",
        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed-ubuntu20.04.cfg ",
        "-- <enter>"
+      ],
-      ]
+      "boot_wait": "2s",
+      "disk_size": "{{ user `disk_size`}}000",
+      "format": "qcow2",
+      "headless": true,
+      "http_directory": "http",
+      "iso_checksum": "md5:9d2b54506f8f9fdad6b72e45aff0f0de",
+      "iso_url": "http://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04/release/ubuntu-20.04-legacy-server-amd64.iso",
+      "name": "ubuntu-20.04-server-{{ user `disk_size`}}G-{{ user `name`}}",
+      "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
+      "ssh_password": "{{user `password`}}",
+      "ssh_timeout": "1800s",
+      "ssh_username": "{{user `user`}}",
+      "type": "qemu"
    }
  ],
  "provisioners": [
    {
-      "type": "shell",
      "execute_command": "echo '{{user `password`}}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
      "scripts": [
        "scripts/update-ubuntu.sh",
        "scripts/grub-ubuntu.sh",
        "{{ user `custom_script` }}"
-      ]
+      ],
+      "type": "shell"
    }
-  ]
+  ],
+  "variables": {
+    "custom_script": "scripts/empty.sh",
+    "disk_size": "20",
+    "domain": "",
+    "name": "image",
+    "password": "slapos",
+    "user": "slapos"
+  }
 }