Merge lp://staging/~oddbloke/cloud-init/lp1506187 into lp://staging/~cloud-init-dev/cloud-init/trunk

Proposed by Dan Watkins
Status: Merged
Merged at revision: 1156
Proposed branch: lp://staging/~oddbloke/cloud-init/lp1506187
Merge into: lp://staging/~cloud-init-dev/cloud-init/trunk
Diff against target: 379 lines (+23/-155)
4 files modified
cloudinit/sources/DataSourceAzure.py (+3/-35)
cloudinit/sources/helpers/azure.py (+0/-21)
tests/unittests/test_datasource/test_azure.py (+18/-59)
tests/unittests/test_datasource/test_azure_helper.py (+2/-40)
To merge this branch: bzr merge lp://staging/~oddbloke/cloud-init/lp1506187
Reviewer Review Type Date Requested Status
Ben Howard (community) Approve
Scott Moser Pending
Review via email: mp+276292@code.staging.launchpad.net

Commit message

Azure: Use DMI data to find instance IDs.

Replace the use of SharedConfig.xml in both the walinuxagent case,
and the case where we communicate with the Azure fabric ourselves.

To post a comment you must log in.
Revision history for this message
Ben Howard (darkmuggle-deactivatedaccount) wrote :

Adding Scott to the reviewers for merge approval and merging.

This change looks sane to me and reduces the complexity of the Datasource. Microsoft has updated the public facing documentation to reflect the use of the system uuid as extracted from dmi data as the authoratative identification of an instance.

We are seeing this as a hot issue. So once this lands in Xenial, I'll run an SRU to get this backported.

+1

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

This looks good. The one question I have is whether or not a instance that used sharedconfig.xml last boot will now think it is a new instance after an upgrade of cloud-init and reboot.

specifically, is the instance id in DMI the same as the instance id in SharedConfig.xml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.