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

Revert syndic from master opts to check test failures

Browse source
This commit is contained in:
David Murphy 2024-08-21 10:53:55 -06:00 • committed by Daniel Wozniak
parent 853d3dafe3
commit 6874ff572e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/config/__init__.py
View file

@ -2505,8 +2505,8 @@ def syndic_config(
# 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"]),
"user": opts.get("syndic_user", opts["user"]),
# DGM test revert "user": opts.get("syndic_user", master_opts["user"]),
"sock_dir": os.path.join(
opts["cachedir"], opts.get("syndic_sock_dir", opts["sock_dir"])
),