Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-linux-azure into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Francis Ginther]

Install the linux-azure kernel for xenial and purge any virtual, generic and 4.4 kernels from the image.

Install the linux-azure kernel for xenial and purge any virtual, generic and 4.4 kernels from the image.

[Robert C Jennings (rcj)]

This looks good. +1

review: Approve

[Chris Glass (tribaal)]

+1

review: Approve

=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2017-02-17 11:21:39 +0000
+++ templates/img-azure.tmpl	2017-09-05 15:41:54 +0000
@@ -203,6 +203,8 @@
                     linux-cloud-tools-virtual-lts-xenial
                     ntp);
              rpkgs=(linux-image-virtual linux-.*3.13.*);;
+    xenial)  pkgs+=(linux-azure)
+             rpkgs+=(linux-image-virtual linux-image-generic linux-.*4.4.*);;
          *)  pkgs+=(linux-cloud-tools-virtual);;
 esac