From 258940882e6146a8ef427f39855e34aefdb945d3 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 21 Sep 2020 22:13:46 +0000 Subject: [PATCH] Do not overwrite master keys salt-api should not overwrite the master's keys when it starts up. Give salt-api it's own cache directory and set of keys. --- salt/netapi/__init__.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/salt/netapi/__init__.py b/salt/netapi/__init__.py index b187b9d39364..629fd4de1e41 100644 --- a/salt/netapi/__init__.py +++ b/salt/netapi/__init__.py @@ -45,11 +45,15 @@ class NetapiClient(object): def __init__(self, opts): self.opts = opts - self.loadauth = salt.auth.LoadAuth(opts) - self.key = salt.daemons.masterapi.access_keys(self.opts) - minopts = copy.deepcopy(self.opts) - minopts["enable_ssh_minions"] = True - self.ckminions = salt.utils.minions.CkMinions(minopts) + apiopts = copy.deepcopy(self.opts) + apiopts["enable_ssh_minions"] = True + apiopts["cachedir"] = os.path.join(opts["cachedir"], "saltapi") + if not os.path.exists(apiopts["cachedir"]): + os.makedirs(apiopts["cachedir"]) + self.resolver = salt.auth.Resolver(apiopts) + self.loadauth = salt.auth.LoadAuth(apiopts) + self.key = salt.daemons.masterapi.access_keys(apiopts) + self.ckminions = salt.utils.minions.CkMinions(apiopts) def _is_master_running(self): """