mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Allow the environment string to be referenced by a bare variable name like:
environment: foo
This commit is contained in:
parent
f16751de29
commit
fbea88b9d9
1 changed files with 3 additions and 1 deletions
|
@ -240,6 +240,8 @@ class Runner(object):
|
|||
if not self.environment:
|
||||
return ""
|
||||
enviro = template.template(self.basedir, self.environment, inject)
|
||||
if isinstance(enviro, basestring) and enviro in inject:
|
||||
enviro = inject[enviro]
|
||||
if type(enviro) != dict:
|
||||
raise errors.AnsibleError("environment must be a dictionary, received %s" % enviro)
|
||||
result = ""
|
||||
|
@ -292,7 +294,7 @@ class Runner(object):
|
|||
if not shebang:
|
||||
raise errors.AnsibleError("module is missing interpreter line")
|
||||
|
||||
cmd = " ".join([environment_string, shebang.replace("#!",""), cmd])
|
||||
cmd = " ".join([environment_string.strip(), shebang.replace("#!","").strip(), cmd])
|
||||
cmd = cmd.strip()
|
||||
|
||||
if tmp.find("tmp") != -1 and C.DEFAULT_KEEP_REMOTE_FILES != '1' and not persist_files:
|
||||
|
|
Loading…
Reference in a new issue