Skip to content

Commit

Permalink
[LIBCLOUD-647] Fix ex_keyname argument handling in the create_node me…
Browse files Browse the repository at this point in the history
…thod of

the Softlayer driver.

Closes #416

Signed-off-by: Tomaz Muraus <tomaz@apache.org>
  • Loading branch information
doberloh authored and Kami committed Dec 16, 2014
1 parent ab68dd9 commit 788ced3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~

Expand Down
6 changes: 5 additions & 1 deletion libcloud/compute/drivers/softlayer.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,11 @@ def create_node(self, **kwargs):
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
Expand Down

0 comments on commit 788ced3

Please sign in to comment.