Merge lp:~oddbloke/vmbuilder/jenkins_kvm-azure_yakkety into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Dan Watkins]

[Philip Roche (philroche)]

Changes look good to me.

review: Approve

=== added file 'templates/img-azure-16.10-addin.tmpl'
--- templates/img-azure-16.10-addin.tmpl	1970-01-01 00:00:00 +0000
+++ templates/img-azure-16.10-addin.tmpl	2016-06-23 11:57:47 +0000
@@ -0,0 +1,58 @@
+# vi: ts=4 noexpandtab syntax=sh
+# Insert the Trusty Config
+CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
+cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
+# Windows Azure specific grub settings
+${CLOUD_IMG_STR}
+
+# Set the default commandline
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"
+
+# Set the grub console type
+GRUB_TERMINAL=serial
+
+# Set the serial command
+GRUB_SERIAL_COMMAND="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"
+
+# Set the recordfail timeout
+GRUB_RECORDFAIL_TIMEOUT=0
+
+# Do not wait on grub prompt
+GRUB_TIMEOUT=0
+EOF
+
+# Add in the client keep alive
+cat << EOF >> "${mp}/etc/ssh/sshd_config"
+
+${CLOUD_IMG_STR}
+ClientAliveInterval 120
+EOF
+
+# Add the configuration for Cloud-init
+cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/90-azure.cfg"
+${CLOUD_IMG_STR}
+system_info:
+   package_mirrors:
+     - arches: [i386, amd64]
+       failsafe:
+         primary: http://archive.ubuntu.com/ubuntu
+         security: http://security.ubuntu.com/ubuntu
+       search:
+         primary:
+           - http://azure.archive.ubuntu.com/ubuntu/
+         security: []
+     - arches: [armhf, armel, default]
+       failsafe:
+         primary: http://ports.ubuntu.com/ubuntu-ports
+         security: http://ports.ubuntu.com/ubuntu-ports
+
+EOF
+
+# Frame buffer fix
+cat << EOF >> "${mp}/etc/initramfs-tools/modules"
+
+# Need for slow boot times due to framebuffer
+hyperv_fb
+EOF
+
+xchroot update-initramfs -u -k all
 
=== added file 'templates/img-azure-16.10-docker.tmpl'
--- templates/img-azure-16.10-docker.tmpl	1970-01-01 00:00:00 +0000
+++ templates/img-azure-16.10-docker.tmpl	2016-06-23 11:57:47 +0000
@@ -0,0 +1,8 @@
+# Install Docker
+dpkgs=(
+        docker.io
+        docker-compose
+    )
+
+xchroot apt-get -y install ${dpkgs[@]}
+xchroot apt-get -y clean
 
=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2016-04-01 08:05:24 +0000
+++ templates/img-azure.tmpl	2016-06-23 11:57:47 +0000
@@ -250,7 +250,17 @@
 #################################################
 
 # Reconfigure grub, since the config is laid during the addin phase
-xchroot dpkg-reconfigure grub-pc
+# Or, on yakkety and later, reinstall grub-pc which is no longer in the base
+# image
+case $suite in
+    precise|trusty|wily|xenial)
+        xchroot dpkg-reconfigure grub-pc
+        ;;
+    *)
+        xchroot apt-get install -qqy grub-pc
+        xchroot apt-get autoremove --purge -y
+        ;;
+esac
 xchroot update-grub
 xchroot grub-install /dev/vdd