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

Use ProgramData instead of C:\ProgramData

Browse source
This commit is contained in:
Twangboy 2022-11-07 17:58:25 -07:00
parent 398d7a611a
commit fa9f648fbe
No known key found for this signature in database
GPG key ID: ED267D5C0DE6F8A6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/utils/cloud.py
View file

@ -1285,8 +1285,9 @@ def deploy_windows(
return False
salt.utils.smb.mkdirs("salttemp", conn=smb_conn)
root_dir = "%PROGRAMDATA%\\Salt Project\\Salt"
salt.utils.smb.mkdirs("{}\\conf\\pki\\minion".format(root_dir), conn=smb_conn)
root_dir = "ProgramData/Salt Project/Salt"
salt.utils.smb.mkdirs("{}/conf/pki/minion".format(root_dir), conn=smb_conn)
root_dir = "ProgramData\\Salt Project\\Salt"
if minion_pub:
salt.utils.smb.put_str(
@ -1369,10 +1370,14 @@ def deploy_windows(
# Add special windows minion configuration
# that must be in the minion config file
windows_minion_conf = {
"ipc_mode": "tcp",
"pki_dir": "/conf/pki/minion",
"multiprocessing": False,
"ipc_mode": minion_conf.pop("ipc_mode", "tcp"),
"pki_dir": minion_conf.pop("pki_dir", "/conf/pki/minion"),
"multiprocessing": minion_conf.pop("multiprocessing", True),
}
if master and "master" not in minion_conf:
windows_minion_conf["master"] = master
if name and "id" not in minion_conf:
windows_minion_conf["id"] = name
minion_conf = dict(minion_conf, **windows_minion_conf)
salt.utils.smb.put_str(
salt_config_to_yaml(minion_conf, line_break="\r\n"),