Merge pull request #34257 from rallytime/fix-34037

Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer

salt/renderers/gpg.py

@@ -123,10 +123,14 @@ def _get_key_dir():
     '''
     return the location of the GPG key directory
     '''
-    if __salt__['config.get']('gpg_keydir'):
-        return __salt__['config.get']('gpg_keydir')
-    else:
-        return os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
+    key_dir = __salt__['config.get']('gpg_keydir')
+    if not key_dir:
+        key_dir = os.path.join(
+            __salt__['config.get']('config_dir'),
+            'gpgkeys'
+        )
+
+    return key_dir
 
 
 def _decrypt_ciphertext(cipher):

tests/unit/renderers/gpg_test.py

@@ -39,18 +39,6 @@ def test__get_gpg_exec(self):
         with patch('salt.utils.which', MagicMock(return_value=False)):
             self.assertRaises(SaltRenderError, gpg._get_gpg_exec)
 
-    def test__get_key_dir(self):
-        '''
-        test _get_key_dir
-        '''
-        cfg_dir = '/gpg/cfg/dir'
-        with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=cfg_dir)}):
-            self.assertEqual(gpg._get_key_dir(), cfg_dir)
-
-        def_dir = '/etc/salt/gpgkeys'
-        with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=False)}):
-            self.assertEqual(gpg._get_key_dir(), def_dir)
-
     def test__decrypt_ciphertext(self):
         '''
         test _decrypt_ciphertext