contradict/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

export __target_host for use in __remote_{copy,exec} scripts

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-11-18 14:44:32 +01:00
parent 654e19f28b
commit 98dec302a6
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/cdist/exec/local.py
View file

@ -95,6 +95,12 @@ class Local(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
self.log.debug("Local run: %s", command) self.log.debug("Local run: %s", command)
if env is None:
env = {}
# Export __target_host for use in __remote_{copy,exec} scripts
env['__target_host'] = self.target_host
try: try:
if return_output: if return_output:
return subprocess.check_output(command, env=env).decode() return subprocess.check_output(command, env=env).decode()
@ -114,8 +120,13 @@ class Local(object):
command.append(script) command.append(script)
self.log.debug("Local run script: %s", command) self.log.debug("Local run script: %s", command)
if env:
self.log.debug("Local run script env: %s", env) if env is None:
env = {}
# Export __target_host for use in __remote_{copy,exec} scripts
env['__target_host'] = self.target_host
self.log.debug("Local run script env: %s", env)
try: try:
if return_output: if return_output: