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

Proposed by Tobias Koch on 2019-03-15
Status: Merged
Merged at revision: 818
Proposed branch: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-kvp-telemetry
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 17 lines (+3/-3)
1 file modified
templates/img-azure.tmpl (+3/-3)
To merge this branch: bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-kvp-telemetry
Reviewer Review Type Date Requested Status
Robert C Jennings 2019-03-15 Approve on 2019-03-19
Francis Ginther 2019-03-15 Approve on 2019-03-18
Review via email: mp+364489@code.launchpad.net

Commit message

Enable KVP telemetry for Bionic.

To post a comment you must log in.
Francis Ginther (fginther) wrote :

+1

review: Approve
Robert C Jennings (rcj) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-azure.tmpl'
2--- templates/img-azure.tmpl 2018-10-14 21:43:12 +0000
3+++ templates/img-azure.tmpl 2019-03-15 09:49:52 +0000
4@@ -333,10 +333,10 @@
5
6 fi
7
8-# Add the configuration for cloud-init KVP telemetry (18.10 and newer)
9-# See Salesforce Case #00199159
10+# Add the configuration for cloud-init KVP telemetry (18.04 and newer).
11+# See Salesforce Case #00199159 and #00218920.
12 case "${suite}" in
13- trusty|xenial|bionic)
14+ trusty|xenial)
15 ;;
16 *)
17 cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/10-azure-kvp.cfg"

Subscribers

People subscribed via source and target branches

to all changes: