Repository: libcloud Updated Branches: refs/heads/trunk ab68dd92c -> 788ced3f7
[LIBCLOUD-647] Fix ex_keyname argument handling in the create_node method of the Softlayer driver. Closes #416 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/788ced3f Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/788ced3f Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/788ced3f Branch: refs/heads/trunk Commit: 788ced3f74433c11aa5bd3f731a2dee2948cfedc Parents: ab68dd9 Author: doberloh <[email protected]> Authored: Tue Dec 16 13:28:44 2014 -0800 Committer: Tomaz Muraus <[email protected]> Committed: Tue Dec 16 23:28:38 2014 +0100 ---------------------------------------------------------------------- CHANGES.rst | 5 +++++ libcloud/compute/drivers/softlayer.py | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/788ced3f/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index a90d2ff..742e290 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -296,6 +296,11 @@ Compute (GITHUB-371) [Jeroen de Korte] +- Fix a bug with handling of the ``ex_keyname`` argument in the Softlayer + driver. + (GITHUB-416, LIBCLOUD-647) + [Dustin Oberloh] + Storage ~~~~~~~ http://git-wip-us.apache.org/repos/asf/libcloud/blob/788ced3f/libcloud/compute/drivers/softlayer.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/softlayer.py b/libcloud/compute/drivers/softlayer.py index 238fd5f..3e5ab29 100644 --- a/libcloud/compute/drivers/softlayer.py +++ b/libcloud/compute/drivers/softlayer.py @@ -349,7 +349,11 @@ class SoftLayerNodeDriver(NodeDriver): newCCI['datacenter'] = {'name': datacenter} if 'ex_keyname' in kwargs: - newCCI['sshKeys'] = [self._key_name_to_id(kwargs['ex_keyname'])] + newCCI['sshKeys'] = [ + { + 'id': self._key_name_to_id(kwargs['ex_keyname']) + } + ] res = self.connection.request( 'SoftLayer_Virtual_Guest', 'createObject', newCCI
