diff options
| author | Brian Coca <bcoca@ansible.com> | 2015-12-05 16:08:00 -0500 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2015-12-05 16:08:00 -0500 |
| commit | 8607aa527de0bceb72eff825e81ad56870a5b9d6 (patch) | |
| tree | 0106e7d7aef209e54744a5d111ebaf6df338c930 | |
| parent | 955710267c1992c5e3b5b9eb77f4c76e289e3313 (diff) | |
| parent | 8ea45e8608fc15e07493b11ce28fe3d3f38865b8 (diff) | |
| download | ansible-8607aa527de0bceb72eff825e81ad56870a5b9d6.tar.gz | |
Merge pull request #13446 from lberruti/no_target_syslog
Make no_target_syslog consistent.
| -rw-r--r-- | examples/ansible.cfg | 2 | ||||
| -rw-r--r-- | lib/ansible/constants.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/action/__init__.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/action/async.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 74aef7a024..87c089f45a 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -182,7 +182,7 @@ #no_log = False # prevents logging of tasks, but only on the targets, data is still logged on the master/controller -#no_target_syslog = True +#no_target_syslog = False # controls the compression level of variables sent to # worker processes. At the default of 0, no compression diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 08d522fcb6..6faae928db 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -159,7 +159,7 @@ DEFAULT_VAR_COMPRESSION_LEVEL = get_config(p, DEFAULTS, 'var_compression_level', # disclosure DEFAULT_NO_LOG = get_config(p, DEFAULTS, 'no_log', 'ANSIBLE_NO_LOG', False, boolean=True) -DEFAULT_NO_TARGET_SYSLOG = get_config(p, DEFAULTS, 'no_target_syslog', 'ANSIBLE_NO_TARGET_SYSLOG', True, boolean=True) +DEFAULT_NO_TARGET_SYSLOG = get_config(p, DEFAULTS, 'no_target_syslog', 'ANSIBLE_NO_TARGET_SYSLOG', False, boolean=True) # selinux DEFAULT_SELINUX_SPECIAL_FS = get_config(p, 'selinux', 'special_context_filesystems', None, 'fuse, nfs, vboxsf, ramfs', islist=True) diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 64a3b51e5d..497143224a 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -382,7 +382,7 @@ class ActionBase(with_metaclass(ABCMeta, object)): module_args['_ansible_check_mode'] = True # set no log in the module arguments, if required - if self._play_context.no_log or not C.DEFAULT_NO_TARGET_SYSLOG: + if self._play_context.no_log or C.DEFAULT_NO_TARGET_SYSLOG: module_args['_ansible_no_log'] = True # set debug in the module arguments, if required diff --git a/lib/ansible/plugins/action/async.py b/lib/ansible/plugins/action/async.py index 51e2413af2..8a7175aeb8 100644 --- a/lib/ansible/plugins/action/async.py +++ b/lib/ansible/plugins/action/async.py @@ -48,7 +48,7 @@ class ActionModule(ActionBase): env_string = self._compute_environment_string() module_args = self._task.args.copy() - if self._play_context.no_log or not C.DEFAULT_NO_TARGET_SYSLOG: + if self._play_context.no_log or C.DEFAULT_NO_TARGET_SYSLOG: module_args['_ansible_no_log'] = True # configure, upload, and chmod the target module |