X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=planetstack%2Fcore%2Fxoslib%2Fobjects%2Fsliceplus.py;h=6bbbfa2235bf2e4c377e61e9b8cc52789dc94cf0;hb=ab385c86e10475c711c350f1ddf1cca0c2accd65;hp=0c662585fbda6b98617708927ca64e8bca098730;hpb=62c66fb877abe4fd098c38b797f0bb624f641082;p=plstackapi.git diff --git a/planetstack/core/xoslib/objects/sliceplus.py b/planetstack/core/xoslib/objects/sliceplus.py index 0c66258..6bbbfa2 100644 --- 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 - 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