Merge lp:~tribaal/vmbuilder/jenkins_kvm-add-zesty-template into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Chris Glass
Status: Merged
Merged at revision: 784
Proposed branch: lp:~tribaal/vmbuilder/jenkins_kvm-add-zesty-template
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 62 lines (+58/-0)
1 file modified
templates/img-azure-17.04-addin.tmpl (+58/-0)
To merge this branch: bzr merge lp:~tribaal/vmbuilder/jenkins_kvm-add-zesty-template
Reviewer Review Type Date Requested Status
Robert C Jennings (community) Approve
Dan Watkins (community) Approve
Review via email: mp+316882@code.launchpad.net

Description of the change

This branch simply adds a template for the azure cloud-init configuration for zesty, which should fix our tests failing.

This was tested to work manually (the image produced by https://cloud-images-jenkins.canonical.com/view/Azure/job/CloudImages_Azure-Custom_or_Test_Images/350/consoleFull was booted, and the apt config point to azure.archive.canonical.com).

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) :
review: Approve
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'templates/img-azure-17.04-addin.tmpl'
--- templates/img-azure-17.04-addin.tmpl 1970-01-01 00:00:00 +0000
+++ templates/img-azure-17.04-addin.tmpl 2017-02-09 17:19:11 +0000
@@ -0,0 +1,58 @@
1# vi: ts=4 noexpandtab syntax=sh
2# Insert the Trusty Config
3CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
4cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
5# Windows Azure specific grub settings
6${CLOUD_IMG_STR}
7
8# Set the default commandline
9GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"
10
11# Set the grub console type
12GRUB_TERMINAL=serial
13
14# Set the serial command
15GRUB_SERIAL_COMMAND="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"
16
17# Set the recordfail timeout
18GRUB_RECORDFAIL_TIMEOUT=0
19
20# Do not wait on grub prompt
21GRUB_TIMEOUT=0
22EOF
23
24# Add in the client keep alive
25cat << EOF >> "${mp}/etc/ssh/sshd_config"
26
27${CLOUD_IMG_STR}
28ClientAliveInterval 120
29EOF
30
31# Add the configuration for Cloud-init
32cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/90-azure.cfg"
33${CLOUD_IMG_STR}
34system_info:
35 package_mirrors:
36 - arches: [i386, amd64]
37 failsafe:
38 primary: http://archive.ubuntu.com/ubuntu
39 security: http://security.ubuntu.com/ubuntu
40 search:
41 primary:
42 - http://azure.archive.ubuntu.com/ubuntu/
43 security: []
44 - arches: [armhf, armel, default]
45 failsafe:
46 primary: http://ports.ubuntu.com/ubuntu-ports
47 security: http://ports.ubuntu.com/ubuntu-ports
48
49EOF
50
51# Frame buffer fix
52cat << EOF >> "${mp}/etc/initramfs-tools/modules"
53
54# Need for slow boot times due to framebuffer
55hyperv_fb
56EOF
57
58xchroot update-initramfs -u -k all

Subscribers

People subscribed via source and target branches