Merge lp:~rcj/vmbuilder/jenkins_kvm_lp1479165 into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Robert C Jennings]

Simple code fix the following error:

+ '[' dist_ge wily trusty ']'
/var/lib/cloud/instance/scripts/launch_config.sh: line 408: [: wily: binary operator expected

However, I would like the review to focus on the impact of running the code which has not run previously. I want to be sure that the cloud-init config change for trusty and prior won't break the image.

[lp:~rcj/vmbuilder/jenkins_kvm_lp1479165]

699. By Robert C Jennings on 2015-07-29

Coding style fix per review

[Ben Howard (darkmuggle-deactivatedaccount)]

This is safe. WALinuxAgent includes a cloud-init config dropped to /etc/cloud/cloud.cfg.d/91_walinuxagent.cfg that defines the datasource. Since cloud-init uses /etc/cloud/cloud.cfg.d/90-dpkg.cfg as part of the debconf selections, the mere presence of WALinuxAgent moots this code.

In fact, WALinuxAgent back to 12.04 has the same code. If anything, I would _drop_ the entire section.

See: https://git.launchpad.net/~utlemming/+git/lp1479165/diff/

review: Approve (peer)

[Dan Watkins (oddbloke)]

Given that we've been looking at dropping WALinuxAgent, I wouldn't drop this section. But this fix looks good.

review: Approve

=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2015-06-11 20:01:23 +0000
+++ templates/img-azure.tmpl	2015-07-29 03:12:05 +0000
@@ -261,7 +261,7 @@
 set -x
 # Reconfigure cloud-init
 debug "Reconfiguring Cloud-init"
-if [ dist_ge "${suite}" "trusty" ]; then
+if dist_ge "${suite}" "trusty"; then
     debug "WALinuxAgent has packaged cloud-init configuration"
 
 else