Merge lp:~kiril-vladimiroff/cloud-init/cloudsigma-lack-of-ssh-key into lp:~cloud-init-dev/cloud-init/trunk

[Kiril Vladimiroff]

Right now CloudSigma's datasource expects that the user will have defined ssh_public_key in his server context or at least that he will not delete the key (it's there by default for each user). If he does it however, the datasource can't get it, does not assume that this key could not be there and therefore the datasource does not work.

This merge proposal just fixes that issue :)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

I think this might be still valid, so please do re-submit.

Scott

Unmerged revisions

988. By Kiril Vladimiroff on 2014-07-25

CloudSigma data source should not rely on the existence of ssh_public_key

=== modified file 'cloudinit/sources/DataSourceCloudSigma.py'
--- cloudinit/sources/DataSourceCloudSigma.py	2014-05-30 18:50:57 +0000
+++ cloudinit/sources/DataSourceCloudSigma.py	2014-07-25 14:50:59 +0000
@@ -100,7 +100,7 @@
             self.vendordata_raw = server_context["vendor_data"]["cloudinit"]
 
         self.metadata = server_context
-        self.ssh_public_key = server_meta['ssh_public_key']
+        self.ssh_public_key = server_meta.get('ssh_public_key', '')
 
         return True