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 4

Testing with master_opts user for syndic_user

Browse source
This commit is contained in:
David Murphy 2024-08-19 16:39:15 -06:00 • committed by Daniel Wozniak
parent 5298d333fa
commit e097b541c9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/config/__init__.py
View file

@ -2502,7 +2502,11 @@ def syndic_config(
),
)
),
"user": opts.get("syndic_user", opts["user"]),
# DGM conf/suse/master has syndic_user for running syndic as a different user
# DGM use urrently set it to 'salt'
# DGM testing getting the master_opts user, and run syndic as that
# DGM "user": opts.get("syndic_user", opts["user"]),
"user": opts.get("syndic_user", master_opts["user"]),
"sock_dir": os.path.join(
opts["cachedir"], opts.get("syndic_sock_dir", opts["sock_dir"])
),
@ -2510,6 +2514,10 @@ def syndic_config(
"cachedir": master_opts["cachedir"],
}
opts.update(syndic_opts)
log.warning("DGM syndic_config, user is set to '%s'", opts["user"])
dgm_user = opts["user"]
print(f"DGM syndic_config, user is set to '{dgm_user}'", flush=True)
# Prepend root_dir to other paths
prepend_root_dirs = [
"pki_dir",