Revert "make callbacks declare needing whitelisting"

another premature merge This reverts commit df8ff85.
pva · Oct 22, 2015 · 5017a96 · 5017a96
1 parent 3c1c5b0
commit 5017a96
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 13 deletions.
diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py
@@ -150,13 +150,12 @@ def load_callbacks(self):
                 # the name of the current plugin and type to see if we need to skip
                 # loading this callback plugin
                 callback_type = getattr(callback_plugin, 'CALLBACK_TYPE', None)
-                callback_needs_whitelist  = getattr(callback_plugin, 'CALLBACK_NEEDS_WHITELIST', False)
                 (callback_name, _) = os.path.splitext(os.path.basename(callback_plugin._original_path))
                 if callback_type == 'stdout':
                     if callback_name != self._stdout_callback or stdout_callback_loaded:
                         continue
                     stdout_callback_loaded = True
-                elif callback_needs_whitelist and (C.DEFAULT_CALLBACK_WHITELIST is None or callback_name not in C.DEFAULT_CALLBACK_WHITELIST):
+                elif C.DEFAULT_CALLBACK_WHITELIST is None or callback_name not in C.DEFAULT_CALLBACK_WHITELIST:
                     continue
 
                 self._callback_plugins.append(callback_plugin(self._display))

diff --git a/lib/ansible/plugins/callback/context_demo.py b/lib/ansible/plugins/callback/context_demo.py
@@ -28,8 +28,7 @@ class CallbackModule(CallbackBase):
     """
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'aggregate'
-    CALLBACK_NAME = 'context_demo'
-    CALLBACK_NEEDS_WHITELIST = True
+    CALLBACK_TYPE = 'context_demo'
 
     def v2_on_any(self, *args, **kwargs):
         i = 0

diff --git a/lib/ansible/plugins/callback/hipchat.py b/lib/ansible/plugins/callback/hipchat.py
@@ -46,9 +46,8 @@ class CallbackModule(CallbackBase):
 
     """
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_VERSION = 2.0
     CALLBACK_NAME = 'hipchat'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
 

diff --git a/lib/ansible/plugins/callback/log_plays.py b/lib/ansible/plugins/callback/log_plays.py
@@ -40,7 +40,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'notification'
     CALLBACK_NAME = 'log_plays'
-    CALLBACK_NEEDS_WHITELIST = True
 
     TIME_FORMAT="%b %d %Y %H:%M:%S"
     MSG_FORMAT="%(now)s - %(category)s - %(data)s\n\n"

diff --git a/lib/ansible/plugins/callback/mail.py b/lib/ansible/plugins/callback/mail.py
@@ -74,7 +74,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'notification'
     CALLBACK_NAME = 'mail'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def v2_runner_on_failed(self, res, ignore_errors=False):
 

diff --git a/lib/ansible/plugins/callback/osx_say.py b/lib/ansible/plugins/callback/osx_say.py
@@ -38,7 +38,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'notification'
     CALLBACK_NAME = 'osx_say'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
 

diff --git a/lib/ansible/plugins/callback/profile_tasks.py b/lib/ansible/plugins/callback/profile_tasks.py
@@ -69,7 +69,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'profile_tasks'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
         self.stats = {}

diff --git a/lib/ansible/plugins/callback/syslog_json.py b/lib/ansible/plugins/callback/syslog_json.py
@@ -26,7 +26,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'syslog_json'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
 

diff --git a/lib/ansible/plugins/callback/timer.py b/lib/ansible/plugins/callback/timer.py
@@ -15,7 +15,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'timer'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
 

diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py
@@ -34,7 +34,6 @@ class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'tree'
-    CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self, display):
         super(CallbackModule, self).__init__(display)