cloud-init-dev team mailing list archive

[Kiril Vladimiroff <kiril.vladimiroff@xxxxxxxxxxxxxx>]

Kiril Vladimiroff has proposed merging lp:~kiril-vladimiroff/cloud-init/cloudsigma-lack-of-ssh-key into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~kiril-vladimiroff/cloud-init/cloudsigma-lack-of-ssh-key/+merge/228331

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 :)
-- 
https://code.launchpad.net/~kiril-vladimiroff/cloud-init/cloudsigma-lack-of-ssh-key/+merge/228331
Your team cloud init development team is requested to review the proposed merge of lp:~kiril-vladimiroff/cloud-init/cloudsigma-lack-of-ssh-key into lp:cloud-init.

=== 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