matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

implement: export __target_host in remote exec

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-21 15:17:19 +02:00
commit 17e7642615
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/cdist/exec/remote.py
View file

@ -111,6 +111,10 @@ class Remote(object):
""" """
assert isinstance(command, (list, tuple)), "list or tuple argument expected, got: %s" % command assert isinstance(command, (list, tuple)), "list or tuple argument expected, got: %s" % command
# export target_host for use in __remote_{exec,copy} scripts
os_environ = os.environ.copy()
os_environ['__target_host'] = self.target_host
# can't pass environment to remote side, so prepend command with # can't pass environment to remote side, so prepend command with
# variable declarations # variable declarations
if env: if env:
@ -122,7 +126,7 @@ class Remote(object):
self.log.debug("Remote run: %s", command) self.log.debug("Remote run: %s", command)
try: try:
if return_output: if return_output:
return subprocess.check_output(command).decode() return subprocess.check_output(command, env=os_environ).decode()
else: else:
subprocess.check_call(command) subprocess.check_call(command)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -140,6 +144,10 @@ class Remote(object):
command = self._exec.split() command = self._exec.split()
command.append(self.target_host) command.append(self.target_host)
# export target_host for use in __remote_{exec,copy} scripts
os_environ = os.environ.copy()
os_environ['__target_host'] = self.target_host
# can't pass environment to remote side, so prepend command with # can't pass environment to remote side, so prepend command with
# variable declarations # variable declarations
if env: if env:
@ -154,7 +162,7 @@ class Remote(object):
try: try:
if return_output: if return_output:
return subprocess.check_output(command).decode() return subprocess.check_output(command, env=os_environ).decode()
else: else:
subprocess.check_call(command) subprocess.check_call(command)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error: