RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42590 from vfreex/cephadm-propagate-env-vars

Browse Source 
cephadm: propagate environment variables to subprocesses
This commit is contained in:
Sebastian Wagner 2021-08-18 11:51:17 +02:00 committed by GitHub
commit bea992a7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cephadm/cephadm
View File

@ -1426,7 +1426,8 @@ def call(ctx: CephadmContext,
process = await asyncio.create_subprocess_exec(
*command,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE)
stderr=asyncio.subprocess.PIPE,
env=os.environ.copy())
assert process.stdout
assert process.stderr
try:
@ -1475,7 +1476,7 @@ def call_timeout(ctx, command, timeout):
raise TimeoutExpired(msg)
try:
return subprocess.call(command, timeout=timeout)
return subprocess.call(command, timeout=timeout, env=os.environ.copy())
except subprocess.TimeoutExpired:
raise_timeout(command, timeout)
@ -4815,7 +4816,7 @@ def command_logs(ctx):
# call this directly, without our wrapper, so that we get an unmolested
# stdout with logger prefixing.
logger.debug('Running command: %s' % ' '.join(cmd))
subprocess.call(cmd) # type: ignore
subprocess.call(cmd, env=os.environ.copy()) # type: ignore
##################################