mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'hide_skipped_hosts' of https://github.com/jsmartin/ansible into jsmartin-hide_skipped_hosts
This commit is contained in:
commit
6cd8aacc81
3 changed files with 18 additions and 11 deletions
|
@ -72,6 +72,11 @@ timeout = 10
|
||||||
# replacing {file}, {host} and {uid} and strftime codes with proper values.
|
# replacing {file}, {host} and {uid} and strftime codes with proper values.
|
||||||
ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
|
ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
|
||||||
|
|
||||||
|
# by default, ansible-playbook will display "Skipping [host]" if it determines a task
|
||||||
|
# should not be run on a host. Set this to "no" if you don't want to see these "Skipping"
|
||||||
|
# messages.
|
||||||
|
# display_skipped_hosts: yes
|
||||||
|
|
||||||
# by default (as of 1.3), Ansible will raise errors when attempting to dereference
|
# by default (as of 1.3), Ansible will raise errors when attempting to dereference
|
||||||
# Jinja2 variables that are not set in templates or action lines. Uncomment this line
|
# Jinja2 variables that are not set in templates or action lines. Uncomment this line
|
||||||
# to revert the behavior to pre-1.3.
|
# to revert the behavior to pre-1.3.
|
||||||
|
|
|
@ -519,6 +519,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
|
||||||
super(PlaybookRunnerCallbacks, self).on_error(host, err)
|
super(PlaybookRunnerCallbacks, self).on_error(host, err)
|
||||||
|
|
||||||
def on_skipped(self, host, item=None):
|
def on_skipped(self, host, item=None):
|
||||||
|
if constants.DISPLAY_SKIPPED_HOSTS:
|
||||||
msg = ''
|
msg = ''
|
||||||
if item:
|
if item:
|
||||||
msg = "skipping: [%s] => (item=%s)" % (host, item)
|
msg = "skipping: [%s] => (item=%s)" % (host, item)
|
||||||
|
|
|
@ -130,6 +130,7 @@ DEFAULT_LOG_PATH = shell_expand_path(get_config(p, DEFAULTS, 'log_
|
||||||
|
|
||||||
ANSIBLE_NOCOLOR = get_config(p, DEFAULTS, 'nocolor', 'ANSIBLE_NOCOLOR', None, boolean=True)
|
ANSIBLE_NOCOLOR = get_config(p, DEFAULTS, 'nocolor', 'ANSIBLE_NOCOLOR', None, boolean=True)
|
||||||
ANSIBLE_NOCOWS = get_config(p, DEFAULTS, 'nocows', 'ANSIBLE_NOCOWS', None, boolean=True)
|
ANSIBLE_NOCOWS = get_config(p, DEFAULTS, 'nocows', 'ANSIBLE_NOCOWS', None, boolean=True)
|
||||||
|
DISPLAY_SKIPPED_HOSTS = get_config(p, DEFAULTS, 'display_skipped_hosts', 'DISPLAY_SKIPPED_HOSTS', True, boolean=True)
|
||||||
ANSIBLE_SSH_ARGS = get_config(p, 'ssh_connection', 'ssh_args', 'ANSIBLE_SSH_ARGS', None)
|
ANSIBLE_SSH_ARGS = get_config(p, 'ssh_connection', 'ssh_args', 'ANSIBLE_SSH_ARGS', None)
|
||||||
ANSIBLE_SSH_CONTROL_PATH = get_config(p, 'ssh_connection', 'control_path', 'ANSIBLE_SSH_CONTROL_PATH', "%(directory)s/ansible-ssh-%%h-%%p-%%r")
|
ANSIBLE_SSH_CONTROL_PATH = get_config(p, 'ssh_connection', 'control_path', 'ANSIBLE_SSH_CONTROL_PATH', "%(directory)s/ansible-ssh-%%h-%%p-%%r")
|
||||||
PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True)
|
PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True)
|
||||||
|
|
Loading…
Reference in a new issue