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
display ssh command in sliver detail view
[plstackapi.git]
/
planetstack
/
core
/
xoslib
/
objects
/
sliceplus.py
diff --git
a/planetstack/core/xoslib/objects/sliceplus.py
b/planetstack/core/xoslib/objects/sliceplus.py
index
0c66258
..
6bbbfa2
100644
(file)
--- a/
planetstack/core/xoslib/objects/sliceplus.py
+++ b/
planetstack/core/xoslib/objects/sliceplus.py
@@
-31,9
+31,9
@@
class SlicePlus(Slice, PlusObjectMixin):
used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1
sliverCount = sliverCount + 1
used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1
sliverCount = sliverCount + 1
- if (sliver.instance_id and sliver.instance_name):
- sshCommand = 'ssh -o "ProxyCommand ssh -q %s@%s" ubuntu@%s' % (sliver.instance_id, sliver.node.name, sliver.instance_name)
- sshCommands.append(sshCommand)
;
+ sshCommand = sliver.get_ssh_command()
+ if sshCommand:
+ sshCommands.append(sshCommand)
ready_sites[site.name] = ready_sites.get(site.name, 0) + 1
ready_sites[site.name] = ready_sites.get(site.name, 0) + 1