Merge ~daniel-thewatkins/cloud-init/+git/cloud-init:lp1603222 into cloud-init:master

Proposed by Dan Watkins on 2016-11-09
Status: Merged
Merged at revision: 9e904bbc3336b96475bfd00fb3bf1262ae4de49f
Proposed branch: ~daniel-thewatkins/cloud-init/+git/cloud-init:lp1603222
Merge into: cloud-init:master
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/sources/DataSourceAzure.py (+1/-1)
Reviewer Review Type Date Requested Status
cloud-init commiters 2016-11-09 Pending
Review via email: mp+310411@code.launchpad.net
To post a comment you must log in.
Scott Moser (smoser) wrote :

Generally this looks ok, but I dont think we have a path for "I didnt find anything".

If we just change this and there is ever not a disk, we'll still provide the alias, i'm not sure if thats a good thing or not (right now in that scenario we provide one alias, i think this just changes the behavior to possibly provide a different wrong alias).

Is that right?

Dan Watkins (daniel-thewatkins) wrote :

Yeah, this doesn't change the behaviour if there is no disk, but it does make it correct if there is one.

(AIUI, there's always an ephemeral disk on Azure, so handling the no-disk situation is less important.)

Scott Moser (smoser) wrote :

This was fixed in commit 9e904bbc3336b96475bfd00fb3bf1262ae4de49f
as part of the re-work for getting reliable mounts in Azure.

https://git.launchpad.net/cloud-init/commit/?id=9e904bbc3336b96475bfd00fb3bf1262ae4de49f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index b802b03..8fa4c01 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -53,7 +53,7 @@ BUILTIN_DS_CONFIG = {
53 'command': BOUNCE_COMMAND,53 'command': BOUNCE_COMMAND,
54 'hostname_command': 'hostname',54 'hostname_command': 'hostname',
55 },55 },
56 'disk_aliases': {'ephemeral0': '/dev/sdb'},56 'disk_aliases': {'ephemeral0': '/dev/disk/cloud/azure_resource'},
57 'dhclient_lease_file': '/var/lib/dhcp/dhclient.eth0.leases',57 'dhclient_lease_file': '/var/lib/dhcp/dhclient.eth0.leases',
58}58}
5959

Subscribers

People subscribed via source and target branches