Merge pull request #49223 from msciciel/fix-salt-key-eauth-token-file

Fix token_file creation using external auth with salt-key
saltstack · Aug 23, 2018 · 2947028 · 2947028
2 parents a3e5d10 + 412015b
commit 2947028
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/utils/parsers.py b/salt/utils/parsers.py
@@ -2522,7 +2522,7 @@ def process_config_dir(self):
     process_config_dir._mixin_prio_ = ConfigDirMixIn._mixin_prio_
 
     def setup_config(self):
-        keys_config = config.master_config(self.get_config_file_path())
+        keys_config = config.client_config(self.get_config_file_path())
         if self.options.gen_keys:
             # Since we're generating the keys, some defaults can be assumed
             # or tweaked

diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py
@@ -712,7 +712,7 @@ def setUp(self):
         self.log_file = '/tmp/salt_key_parser_test'
         self.key_logfile = '/tmp/key_logfile'
         # Function to patch
-        self.config_func = 'salt.config.master_config'
+        self.config_func = 'salt.config.client_config'
 
         # Mock log setup
         self.setup_log()