Update disk-image-builder scripts to allow IPv6

Change-Id: I28ed08689db97eabc21726afa9d977fcda526dfb
Signed-off-by: selias <samelias@cisco.com>

1 files changed, 68 insertions, 50 deletions

diff --git a/resources/tools/disk-image-builder/ubuntu/ubuntu-16.04.1.json b/resources/tools/disk-image-builder/ubuntu/ubuntu-16.04.1.json
index e333eb5937..f02c886508 100644
--- a/resources/tools/disk-image-builder/ubuntu/ubuntu-16.04.1.json
+++ b/resources/tools/disk-image-builder/ubuntu/ubuntu-16.04.1.json
@@ -18,7 +18,7 @@
       "name": "{{user `release`}}-virtualbox",
       "type": "virtualbox-iso",
       "guest_os_type": "Ubuntu_64",
-      "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.1-server-amd64.iso",
+      "iso_url": "http://old-releases.ubuntu.com/releases/16.04.1/ubuntu-16.04.1-server-amd64.iso",
       "iso_checksum": "d2d939ca0e65816790375f6826e4032f",
       "iso_checksum_type": "md5",
       "output_directory": "{{user `output_dir`}}",
@@ -27,38 +27,45 @@
       "disk_size": "4096",
       "http_directory": "html",
       "iso_target_path" : "build/ubuntu-16.04.1-server-amd64.iso",
+      "boot_wait": "30s",
       "boot_command":
         [
-          "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "/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>",
-          " locale=en_US<wait>",
-          " netcfg/get_domain=vm<wait>",
-          " netcfg/get_hostname=virtualbox<wait>",
-          " grub-installer/bootdev=/dev/vda<wait>",
-          " noapic<wait>",
-          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg",
-          " -- <wait>",
-           "<enter><wait>"
+          "<enter><wait>",
+          "<f6><esc>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs>",
+          "/install/vmlinuz",
+          " auto",
+          " console-setup/ask_detect=false",
+          " console-setup/layoutcode=us",
+          " console-setup/modelcode=pc105",
+          " debconf/frontend=noninteractive",
+          " debian-installer=en_US",
+          " fb=false",
+          " initrd=/install/initrd.gz",
+          " kbd-chooser/method=us",
+          " keyboard-configuration/layout=USA",
+          " keyboard-configuration/variant=USA",
+          " locale=en_US",
+          " netcfg/get_domain=vm",
+          " netcfg/get_hostname=qemu",
+          " grub-installer/bootdev=/dev/vda",
+          " noapic",
+          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg --- ",
+          "<enter>"
         ]
     },
     {
       "name": "{{user `release`}}-qemu",
       "type": "qemu",
-      "iso_url": "http://releases.ubuntu.com/16.04.1/ubuntu-16.04.1-server-amd64.iso",
+      "iso_url": "http://old-releases.ubuntu.com/releases/16.04.1/ubuntu-16.04.1-server-amd64.iso",
       "iso_checksum": "d2d939ca0e65816790375f6826e4032f",
       "iso_checksum_type": "md5",
       "output_directory": "{{user `output_dir`}}",
@@ -68,32 +75,39 @@
       "http_directory": "html",
       "iso_target_path" : "build/ubuntu-16.04.1-server-amd64.iso",
       "headless": "true",
+      "boot_wait": "30s",
       "boot_command":
         [
-          "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-          "/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>",
-          " locale=en_US<wait>",
-          " netcfg/get_domain=vm<wait>",
-          " netcfg/get_hostname=qemu<wait>",
-          " grub-installer/bootdev=/dev/vda<wait>",
-          " noapic<wait>",
-          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg",
-          " -- <wait>",
-           "<enter><wait>"
+          "<enter><wait>i",
+          "<f6><esc>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+          "<bs><bs><bs>",
+          "/install/vmlinuz",
+          " auto",
+          " console-setup/ask_detect=false",
+          " console-setup/layoutcode=us",
+          " console-setup/modelcode=pc105",
+          " debconf/frontend=noninteractive",
+          " debian-installer=en_US",
+          " fb=false",
+          " initrd=/install/initrd.gz",
+          " kbd-chooser/method=us",
+          " keyboard-configuration/layout=USA",
+          " keyboard-configuration/variant=USA",
+          " locale=en_US",
+          " netcfg/get_domain=vm",
+          " netcfg/get_hostname=qemu",
+          " grub-installer/bootdev=/dev/vda",
+          " noapic",
+          " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg --- ",
+          "<enter>"
         ]
     }
   ],
@@ -124,6 +138,10 @@
     },
     {
       "type": "shell",
+      "script": "scripts-remote/disable_ipv6.sh"
+    },
+    {
+      "type": "shell",
       "script": "scripts-remote/cleanup.sh"
     }
   ],