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

[Dan Watkins]

[Scott Moser (smoser)]

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 (oddbloke)]

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)]

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

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 = {
         'command': BOUNCE_COMMAND,
         'hostname_command': 'hostname',
     },
-    'disk_aliases': {'ephemeral0': '/dev/sdb'},
+    'disk_aliases': {'ephemeral0': '/dev/disk/cloud/azure_resource'},
     'dhclient_lease_file': '/var/lib/dhcp/dhclient.eth0.leases',
 }