Skip to content
Snippets Groups Projects
Commit 50eaa5da authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

qa_utils: Virtual cluster support for SSH commands


In virtual clusters, all “gnt-*” and “ganeti-*” commands require
environment variables to be set for the virtual cluster root directory
and node name. The “cmd” script generated by “vcluster-setup” is a
wrapper setting those variables.

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarBernardo Dal Seno <bdalseno@google.com>
parent c072e788
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,7 @@ from ganeti import compat ...@@ -41,6 +41,7 @@ from ganeti import compat
from ganeti import constants from ganeti import constants
from ganeti import ht from ganeti import ht
from ganeti import pathutils from ganeti import pathutils
from ganeti import vcluster
import qa_config import qa_config
import qa_error import qa_error
...@@ -250,9 +251,25 @@ def GetSSHCommand(node, cmd, strict=True, opts=None, tty=None): ...@@ -250,9 +251,25 @@ def GetSSHCommand(node, cmd, strict=True, opts=None, tty=None):
spath = _MULTIPLEXERS[node][0] spath = _MULTIPLEXERS[node][0]
args.append("-oControlPath=%s" % spath) args.append("-oControlPath=%s" % spath)
args.append("-oControlMaster=no") args.append("-oControlMaster=no")
args.append(node)
if cmd: (vcluster_master, vcluster_basedir) = \
args.append(cmd) qa_config.GetVclusterSettings()
if vcluster_master:
args.append(vcluster_master)
args.append("%s/%s/cmd" % (vcluster_basedir, node))
if cmd:
# For virtual clusters the whole command must be wrapped using the "cmd"
# script, as that script sets a number of environment variables. If the
# command contains shell meta characters the whole command needs to be
# quoted.
args.append(utils.ShellQuote(cmd))
else:
args.append(node)
if cmd:
args.append(cmd)
return args return args
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment