git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
key is now just an attribute of the user model. Added 'creator' field to sliver model
[plstackapi.git]
/
planetstack
/
openstack
/
driver.py
diff --git
a/planetstack/openstack/driver.py
b/planetstack/openstack/driver.py
index
f84fbb8
..
a38b0a1
100644
(file)
--- a/
planetstack/openstack/driver.py
+++ b/
planetstack/openstack/driver.py
@@
-278,12
+278,16
@@
class OpenStackDriver:
return 1
return 1
- def create_keypair(self, name, key):
+ def create_keypair(self, name,
public_
key):
keys = self.shell.nova.keypairs.findall(name=name)
if keys:
key = keys[0]
keys = self.shell.nova.keypairs.findall(name=name)
if keys:
key = keys[0]
+ # update key
+ if key.public_key != public_key:
+ self.delete_keypair(key.id)
+ key = self.shell.nova.keypairs.create(name=name, public_key=public_key)
else:
else:
- key = self.shell.nova.keypairs.create(name=name, public_key=key)
+ key = self.shell.nova.keypairs.create(name=name, public_key=
public_
key)
return key
def delete_keypair(self, id):
return key
def delete_keypair(self, id):