saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid errors when sudo_user is set

Browse source 
When sudo_user is used, the job is forked into a new pid when sudo is
executed. If a state then tries itself to execute states (such as when a
state invokes state.single), the fact that the forked PID was different
from the PID from which the job was started will cause Salt to refuse to
run the state.

This avoids this by conditionally setting concurrent to True when
invoking states from within states.
This commit is contained in:
Erik Johnson 2017-01-05 12:35:00 -06:00
parent 55d1747792
commit b37f7ffa38
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/states/archive.py
View file

@ -869,6 +869,7 @@ def extracted(name,
else:
source_sum = {}
concurrent = bool(__opts__.get('sudo_user'))
if not source_is_local and not os.path.isfile(cached_source):
if __opts__['test']:
ret['result'] = None
@ -885,7 +886,8 @@ def extracted(name,
source_hash_name=source_hash_name,
makedirs=True,
skip_verify=skip_verify,
saltenv=__env__)
saltenv=__env__,
concurrent=concurrent)
log.debug('file.managed: {0}'.format(file_result))
# Get actual state result. The state.single return is a single-element
@ -1324,7 +1326,8 @@ def extracted(name,
user=user,
group=group,
recurse=recurse,
test=__opts__['test'])
test=__opts__['test'],
concurrent=concurrent)
try:
dir_result = dir_result[next(iter(dir_result))]
except AttributeError: