Skip to content

CIRCLE / client

Go to a project
Commit 96f4d71d by Csók Tamás
Options

client: more string modification

parent 9334dd45
Showing with 14 additions and 4 deletions
dist/cloud_connect_from_linux.py
...@@ -26,8 +26,13 @@ def connect(vm): ...@@ -26,8 +26,13 @@ def connect(vm):
vm.password -- Password used for the connection vm.password -- Password used for the connection
""" """
if vm.protocol == "SSH": if vm.protocol == "SSH":
command = ("sshpass -p %s ssh -p %s" % (vm.password, vm.port) command = ("sshpass -p %(password)s ssh -p %(port)s"
" -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host)) " -o StrictHostKeyChecking=no %(user)s@%(host)s" % {
'password': vm.password,
'port': vm.port,
'user': vm.user,
'host': vm.host
})
subprocess.call(command, shell=True) subprocess.call(command, shell=True)
elif vm.protocol in ("NX", "RDP"): elif vm.protocol in ("NX", "RDP"):
server = "%s:%s" % (vm.host, vm.port) server = "%s:%s" % (vm.host, vm.port)
......
src/python/cloud_connect_from_linux.py
...@@ -26,8 +26,13 @@ def connect(vm): ...@@ -26,8 +26,13 @@ def connect(vm):
vm.password -- Password used for the connection vm.password -- Password used for the connection
""" """
if vm.protocol == "SSH": if vm.protocol == "SSH":
command = ("sshpass -p %s ssh -p %s" % (vm.password, vm.port) command = ("sshpass -p %(password)s ssh -p %(port)s"
" -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host)) " -o StrictHostKeyChecking=no %(user)s@%(host)s" % {
'password': vm.password,
'port': vm.port,
'user': vm.user,
'host': vm.host
})
subprocess.call(command, shell=True) subprocess.call(command, shell=True)
elif vm.protocol in ("NX", "RDP"): elif vm.protocol in ("NX", "RDP"):
server = "%s:%s" % (vm.host, vm.port) server = "%s:%s" % (vm.host, vm.port)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment