From 3438db0a0edbc9f22fe6d6edb6895d58e3cd7374 Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Fri, 24 Oct 2014 14:46:44 -0700 Subject: [PATCH 1/2] Fix for #16888 We can't set the default value to something if you want the config to be relative to cachedir. Since there is already code in apply_minion_config to take care of this we remove this, meaning now that if you set cachedir it won't break these --- salt/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/config.py b/salt/config.py index be39291ac1..503a72b624 100644 --- a/salt/config.py +++ b/salt/config.py @@ -292,7 +292,7 @@ DEFAULT_MINION_OPTS = { 'failhard': False, 'autoload_dynamic_modules': True, 'environment': None, - 'extension_modules': os.path.join(salt.syspaths.CACHE_DIR, 'extmods'), + 'extension_modules': '', 'state_top': 'top.sls', 'startup_states': '', 'sls_list': [], From a81898f0b1c99906eb2f98213b09990c5596a631 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Fri, 24 Oct 2014 16:45:45 -0600 Subject: [PATCH 2/2] Fix broken salt ssh extension mods dir --- salt/client/ssh/ssh_py_shim.py | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/client/ssh/ssh_py_shim.py b/salt/client/ssh/ssh_py_shim.py index 308c304cc9..5fad34b4cf 100644 --- a/salt/client/ssh/ssh_py_shim.py +++ b/salt/client/ssh/ssh_py_shim.py @@ -93,6 +93,7 @@ def unpack_ext(ext_path): 'var', 'cache', 'salt', + 'minion', 'extmods') tfile = tarfile.TarFile.gzopen(ext_path) tfile.extractall(path=modcache)