git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
567e3e6
)
fix bug
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 24 Jun 2013 13:37:15 +0000
(09:37 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 24 Jun 2013 13:37:56 +0000
(09:37 -0400)
planetstack/openstack/manager.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/manager.py
b/planetstack/openstack/manager.py
index
8016888
..
bec3901
100644
(file)
--- a/
planetstack/openstack/manager.py
+++ b/
planetstack/openstack/manager.py
@@
-305,7
+305,7
@@
class OpenStackManager:
def save_sliver(self, sliver):
if not sliver.instance_id:
slice_memberships = SliceMembership.objects.filter(slice=sliver.slice)
def save_sliver(self, sliver):
if not sliver.instance_id:
slice_memberships = SliceMembership.objects.filter(slice=sliver.slice)
- pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key !=
null
]
+ pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key !=
None
]
pubkeys.append(sliver.creator.public_key)
instance = self.driver.spawn_instance(name=sliver.name,
key_name = sliver.creator.keyname,
pubkeys.append(sliver.creator.public_key)
instance = self.driver.spawn_instance(name=sliver.name,
key_name = sliver.creator.keyname,