Merge pull request saltstack#39367 from gtmanfred/develop

add extmod_blacklist to make it easier to remove modules
mcpanayides · Feb 17, 2017 · deba6d2 · deba6d2
2 parents 13b254a + d332b33
commit deba6d2
Show file tree

Hide file tree

Showing 7 changed files with 260 additions and 91 deletions.
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
@@ -245,7 +245,7 @@ each of Salt's module types such as ``runners``, ``output``, ``wheel``,
 
     extension_modules: /root/salt_extmods
 
-``extmod_whitelist``
+``extmod_whitelist/extmod_blacklist``
 --------------------
 
 .. versionadded:: Nitrogen
@@ -263,6 +263,10 @@ whitelist an empty list.
         - custom_engine
       pillars: []
 
+    extmod_blacklist:
+      modules:
+        - specific_module
+
 Valid options:
   - modules
   - states

diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
@@ -1197,12 +1197,12 @@ below.
     providers:
       service: systemd
 
-``extmod_whitelist``
+``extmod_whitelist/extmod_blacklist``
 --------------------
 
 .. versionadded:: Nitrogen
 
-By using this dictionary, the modules that are synced to the minion's extmod cache using `saltutil.sync_*`can be
+By using this dictionary, the modules that are synced to the minion's extmod cache using `saltutil.sync_*` can be
 limited.  If nothing is set to a specific type, then all modules are accepted.  To block all modules of a specific type,
 whitelist an empty list.
 
@@ -1215,6 +1215,11 @@ whitelist an empty list.
         - custom_engine
       pillars: []
 
+    extmod_blacklist:
+      modules:
+        - specific_module
+
+
 Valid options:
   - beacons
   - sdb

diff --git a/salt/config/__init__.py b/salt/config/__init__.py
@@ -994,8 +994,9 @@ def _gather_buffer_space():
     # to the master is attempted.
     'scheduler_before_connect': bool,
 
-    # Whitelist specific modules to be synced
+    # Whitelist/blacklist specific modules to be synced
     'extmod_whitelist': dict,
+    'extmod_blacklist': dict,
 
     # django auth
     'django_auth_path': str,
@@ -1257,6 +1258,7 @@ def _gather_buffer_space():
     'scheduler_before_connect': False,
     'cache': 'localfs',
     'extmod_whitelist': {},
+    'extmod_blacklist': {},
 }
 
 DEFAULT_MASTER_OPTS = {
@@ -1537,6 +1539,7 @@ def _gather_buffer_space():
     'min_extra_mods': '',
     'ssl': None,
     'extmod_whitelist': {},
+    'extmod_blacklist': {},
     'clean_dynamic_modules': True,
     'django_auth_path': '',
     'django_auth_settings': '',