Import version 0.7.5-0ubuntu1.21ubuntu/0.7.5-0ubuntu1.21

Imported using git-import-dsc

4 files changed, 27 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index f142eba1..cb63b8bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cloud-init (0.7.5-0ubuntu1.21) trusty; urgency=medium
+
+  * Microsoft Azure:
+    - Install udev rules to create /dev/disk/cloud entries for Azure ephemeral
+      disk.
+    - debian/patches/lp-1603222-fix-ephemeral-disk-fstab.patch:
+      - Use /dev/disk/cloud entries for ephemeral disk (LP: #1603222)
+
+ -- Daniel Watkins <daniel.watkins@canonical.com>  Fri, 25 Nov 2016 10:12:20 +0000
+
 cloud-init (0.7.5-0ubuntu1.20) trusty; urgency=medium
 
   * GCE:
diff --git a/debian/cloud-init.install b/debian/cloud-init.install
index 9f4c0dfe..f96dc3d2 100644
--- a/debian/cloud-init.install
+++ b/debian/cloud-init.install
@@ -7,3 +7,4 @@ usr/lib/cloud-init
 usr/lib/python*/*-packages/*egg-info
 usr/lib/python*/*-packages/cloudinit
 usr/share/doc/cloud-init
+lib/udev/rules.d
diff --git a/debian/patches/lp-1603222-fix-ephemeral-disk-fstab.patch b/debian/patches/lp-1603222-fix-ephemeral-disk-fstab.patch
new file mode 100644
index 00000000..432b1a7a
--- /dev/null
+++ b/debian/patches/lp-1603222-fix-ephemeral-disk-fstab.patch
@@ -0,0 +1,15 @@
+Author: Daniel Watkins <daniel.watkins@canonical.com>
+Bug: https://bugs.launchpad.net/bugs/1603222
+Applied-Upstream: yes
+Description: Use udev-created reference for Azure ephemeral disks
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -51,7 +51,7 @@
+         'command': BOUNCE_COMMAND,
+         'hostname_command': 'hostname',
+         },
+-    'disk_aliases': {'ephemeral0': '/dev/sdb'},
++    'disk_aliases': {'ephemeral0': '/dev/disk/cloud/azure_resource'},
+ }
+ 
+ BUILTIN_CLOUD_CONFIG = {
diff --git a/debian/patches/series b/debian/patches/series
index 8d80d9c8..d20f78b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ lp-1540965-SmartOS-Add-support-for-Joyent-LX-Brand-Zones.patch
 lp-1551419-azure-handle-flipped-uuid-endianness.patch
 lp-1553158-bigstep.patch
 lp-1581200-gce-metadatafqdn.patch
+lp-1603222-fix-ephemeral-disk-fstab.patch