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

Clean up cruft and add comment

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-06-03 13:02:36 -07:00 • committed by Daniel Wozniak
parent 534bf76463
commit 9d24b79637
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/channel/server.py
View file

@ -53,11 +53,9 @@ class ReqServerChannel:
def __init__(self, opts, transport):
self.opts = opts
self.transport = transport
# The event and master_key attributes will be populated after fork.
self.event = None
# self.event = salt.utils.event.get_master_event(
# self.opts, self.opts["sock_dir"], listen=False
# )
# self.master_key = salt.crypt.MasterKeys(self.opts)
self.master_key = None
def pre_fork(self, process_manager):
"""

12
tests/pytests/functional/channel/test_server.py
View file

@ -78,18 +78,6 @@ def master_config(root_dir, transport):
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
)
# master_conf["transport"] = transport
# master_conf["id"] = "master"
# master_conf["root_dir"] = str(root_dir)
# master_conf["sock_dir"] = str(root_dir)
# master_conf["interface"] = "127.0.0.1"
# master_conf["publish_port"] = ports.get_unused_localhost_port()
# master_conf["ret_port"] = ports.get_unused_localhost_port()
# master_conf["pki_dir"] = str(root_dir / "pki")
# "fips_mode": FIPS_TESTRUN,
# "publish_signing_algorithm": (
# "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
# ),
os.makedirs(master_conf["pki_dir"])
salt.crypt.gen_keys(master_conf["pki_dir"], "master", 4096)
minions_keys = os.path.join(master_conf["pki_dir"], "minions")