git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbe1056
)
fix TypeError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 6 Aug 2012 04:32:41 +0000
(
00:32
-0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 6 Aug 2012 04:32:41 +0000
(
00:32
-0400)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
17f42d8
..
da2fc53
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-171,7
+171,9
@@
class OSAggregate:
def create_instance_key(self, slice_hrn, user):
- key_name = "%s:%s" (slice_name, Xrn(user['urn']).get_hrn())
+ slice_name = Xrn(slice_hrn).leaf
+ user_name = Xrn(user['urn']).leaf
+ key_name = "%s:%s" % (slice_name, user_name)
pubkey = user['keys'][0]
key_found = False
existing_keys = self.driver.shell.nova_manager.keypairs.findall(name=key_name)