diff -Nru cloud-init-0.6.3/debian/changelog cloud-init-0.6.3/debian/changelog --- cloud-init-0.6.3/debian/changelog 2015-09-17 20:22:10.000000000 +0000 +++ cloud-init-0.6.3/debian/changelog 2015-11-17 17:02:08.000000000 +0000 @@ -1,3 +1,18 @@ +cloud-init (0.6.3-0ubuntu1.24) precise; urgency=medium + + * d/patches/lp-1506244-azure-ssh-key-values.patch: AZURE: Add support + and preference for fabric provided public SSH public key values over + fingerprints (LP: #1506244). + + -- Ben Howard Tue, 17 Nov 2015 10:02:08 -0700 + +cloud-init (0.6.3-0ubuntu1.23) precise; urgency=medium + + * d/patches/lp-1177432-same-archives-as-ubuntu-server.patch: use the + same archive pockets as Ubuntu Server (LP: #1177432). + + -- Ben Howard Thu, 05 Nov 2015 09:50:44 -0700 + cloud-init (0.6.3-0ubuntu1.22) precise; urgency=medium * debian/patches/lp-1458052-redact-azure-password.patch: diff -Nru cloud-init-0.6.3/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch cloud-init-0.6.3/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch --- cloud-init-0.6.3/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch 1970-01-01 00:00:00.000000000 +0000 +++ cloud-init-0.6.3/debian/patches/lp-1177432-same-archives-as-ubuntu-server.patch 2015-11-05 16:58:49.000000000 +0000 @@ -0,0 +1,46 @@ +--- a/templates/sources.list.tmpl ++++ b/templates/sources.list.tmpl +@@ -9,13 +9,13 @@ + + # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to + # newer versions of the distribution. +-deb $mirror $codename main +-deb-src $mirror $codename main ++deb $mirror $codename main restricted ++deb-src $mirror $codename main restricted + + \## Major bug fix updates produced after the final release of the + \## distribution. +-deb $mirror $codename-updates main +-deb-src $mirror $codename-updates main ++deb $mirror $codename-updates main restricted ++deb-src $mirror $codename-updates main restricted + + \## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu + \## team. Also, please note that software in universe WILL NOT receive any +@@ -30,10 +30,10 @@ + \## your rights to use the software. Also, please note that software in + \## multiverse WILL NOT receive any review or updates from the Ubuntu + \## security team. +-# deb $mirror $codename multiverse +-# deb-src $mirror $codename multiverse +-# deb $mirror $codename-updates multiverse +-# deb-src $mirror $codename-updates multiverse ++deb $mirror $codename multiverse ++deb-src $mirror $codename multiverse ++deb $mirror $codename-updates multiverse ++deb-src $mirror $codename-updates multiverse + + \## Uncomment the following two lines to add software from the 'backports' + \## repository. +@@ -42,8 +42,8 @@ + \## newer versions of some applications which may provide useful features. + \## Also, please note that software in backports WILL NOT receive any review + \## or updates from the Ubuntu security team. +-# deb $mirror $codename-backports main restricted universe multiverse +-# deb-src $mirror $codename-backports main restricted universe multiverse ++deb $mirror $codename-backports main restricted universe multiverse ++deb-src $mirror $codename-backports main restricted universe multiverse + + \## Uncomment the following two lines to add software from Canonical's + \## 'partner' repository. diff -Nru cloud-init-0.6.3/debian/patches/lp-1506244-azure-ssh-key-values.patch cloud-init-0.6.3/debian/patches/lp-1506244-azure-ssh-key-values.patch --- cloud-init-0.6.3/debian/patches/lp-1506244-azure-ssh-key-values.patch 1970-01-01 00:00:00.000000000 +0000 +++ cloud-init-0.6.3/debian/patches/lp-1506244-azure-ssh-key-values.patch 2015-11-17 17:51:33.000000000 +0000 @@ -0,0 +1,46 @@ +Description: AZURE: add support/preference for SSH public key values + Azure has started to support SSH public key values in addition to SSH + public key fingerprints. Per MS, this patch prefers fabric provided + values instead of fingerprints. +Author: Ben Howard +Origin: upstream, http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/1149 +Bug: https://bugs.launchpad.net/cloud-init/+bug/1506244 +--- a/cloudinit/DataSourceAzure.py ++++ b/cloudinit/DataSourceAzure.py +@@ -189,9 +189,15 @@ + wait_for = [shcfgxml] + + fp_files = [] ++ key_value = None + for pk in self.cfg.get('_pubkeys', []): +- bname = pk['fingerprint'] + ".crt" +- fp_files += [os.path.join(mycfg['data_dir'], bname)] ++ if pk.get('value', None): ++ key_value = pk['value'] ++ LOG.debug("ssh authentication: using value from fabric") ++ else: ++ bname = str(pk['fingerprint'] + ".crt") ++ fp_files += [os.path.join(ddir, bname)] ++ LOG.debug("ssh authentication: using fingerprint from fabric") + + start = time.time() + missing = wait_for_files(wait_for + fp_files) +@@ -209,7 +215,7 @@ + except ValueError as e: + LOG.warn("failed to get instance id in %s: %s" % (shcfgxml, e)) + +- pubkeys = pubkeys_from_crt_files(fp_files) ++ pubkeys = key_value or pubkeys_from_crt_files(fp_files) + + self.metadata['public-keys'] = pubkeys + +@@ -474,7 +480,8 @@ + for pk_node in pubkeys: + if not pk_node.hasChildNodes(): + continue +- cur = {'fingerprint': "", 'path': ""} ++ ++ cur = {'fingerprint': "", 'path': "", 'value': ""} + for child in pk_node.childNodes: + if (child.nodeType == text_node or not child.localName): + continue diff -Nru cloud-init-0.6.3/debian/patches/series cloud-init-0.6.3/debian/patches/series --- cloud-init-0.6.3/debian/patches/series 2015-09-17 20:18:55.000000000 +0000 +++ cloud-init-0.6.3/debian/patches/series 2015-11-17 17:02:08.000000000 +0000 @@ -38,3 +38,5 @@ lp-1492468-config-drive_alternative-interface-path.patch lp-1458052-redact-azure-password.patch lp-1382481-cloudstack-vr.patch +lp-1177432-same-archives-as-ubuntu-server.patch +lp-1506244-azure-ssh-key-values.patch