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

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

Subscribers

People subscribed via source and target branches