Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-kvp-telemetry-xenial into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Tobias Koch]

Enable KVP telemetry for Xenial.

This should not go in before the next image release.

[Francis Ginther (fginther)]

LGTM other then the comment.

review: Approve

[lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-kvp-telemetry-xenial]

830. By Tobias Koch on 2019-05-09

Enable KVP telemetry for Xenial: update comment and SF case refs

[Tobias Koch (tobijk)]

Thanks for pointing that out, @fginther.

[Robert C Jennings (rcj)]

review: Approve

=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2019-03-21 09:07:31 +0000
+++ templates/img-azure.tmpl	2019-05-09 13:05:12 +0000
@@ -327,10 +327,10 @@
 
 fi
 
-# Add the configuration for cloud-init KVP telemetry (18.04 and newer).
-# See Salesforce Case #00199159 and #00218920.
+# Add the configuration for cloud-init KVP telemetry (16.04 and newer).
+# See Salesforce Cases #00199159, #00218920 and #00224529.
 case "${suite}" in
-    trusty|xenial)
+    trusty)
         ;;
     *)
         cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/10-azure-kvp.cfg"