cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3127 from bennojoy/devel

Browse source 
bug fix for #3077, environment settings for script
This commit is contained in:
Michael DeHaan 2013-06-18 17:57:10 -07:00
commit fc2d25eb82
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/runner/action_plugins/script.py
View file

@ -61,7 +61,8 @@ class ActionModule(object):
prepcmd = 'chmod +x %s' % tmp_src prepcmd = 'chmod +x %s' % tmp_src
# add preparation steps to one ssh roundtrip executing the script # add preparation steps to one ssh roundtrip executing the script
module_args = prepcmd + '; ' + tmp_src + ' ' + args env_string = self.runner._compute_environment_string(inject)
module_args = prepcmd + '; ' + env_string + tmp_src + ' ' + args
handler = utils.plugins.action_loader.get('raw', self.runner) handler = utils.plugins.action_loader.get('raw', self.runner)
result = handler.run(conn, tmp, 'raw', module_args, inject) result = handler.run(conn, tmp, 'raw', module_args, inject)