ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'hide_skipped_hosts' of https://github.com/jsmartin/ansible into jsmartin-hide_skipped_hosts

Browse source
This commit is contained in:
James Cammarata 2013-09-30 20:22:53 -05:00
commit 6cd8aacc81
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/ansible.cfg
View file

@ -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.

23
lib/ansible/callbacks.py
View file

@ -74,7 +74,7 @@ def get_cowsay_info():
cowsay, noncow = get_cowsay_info() cowsay, noncow = get_cowsay_info()
def log_lockfile(): def log_lockfile():
tempdir = tempfile.gettempdir() tempdir = tempfile.gettempdir()
uid = os.getuid() uid = os.getuid()
path = os.path.join(tempdir, ".ansible-lock.%s" % uid) path = os.path.join(tempdir, ".ansible-lock.%s" % uid)
return path return path
@ -93,7 +93,7 @@ def log_flock(runner):
fcntl.lockf(LOG_LOCK, fcntl.LOCK_EX) fcntl.lockf(LOG_LOCK, fcntl.LOCK_EX)
except OSError: except OSError:
pass pass
def log_unflock(runner): def log_unflock(runner):
if runner is not None: if runner is not None:
@ -471,7 +471,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
super(PlaybookRunnerCallbacks, self).on_failed(host, results, ignore_errors=ignore_errors) super(PlaybookRunnerCallbacks, self).on_failed(host, results, ignore_errors=ignore_errors)
def on_ok(self, host, host_result): def on_ok(self, host, host_result):
item = host_result.get('item', None) item = host_result.get('item', None)
host_result2 = host_result.copy() host_result2 = host_result.copy()
@ -519,13 +519,14 @@ 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):
msg = '' if constants.DISPLAY_SKIPPED_HOSTS:
if item: msg = ''
msg = "skipping: [%s] => (item=%s)" % (host, item) if item:
else: msg = "skipping: [%s] => (item=%s)" % (host, item)
msg = "skipping: [%s]" % host else:
display(msg, color='cyan', runner=self.runner) msg = "skipping: [%s]" % host
super(PlaybookRunnerCallbacks, self).on_skipped(host, item) display(msg, color='cyan', runner=self.runner)
super(PlaybookRunnerCallbacks, self).on_skipped(host, item)
def on_no_hosts(self): def on_no_hosts(self):
display("FATAL: no hosts matched or all hosts have already failed -- aborting\n", color='red', runner=self.runner) display("FATAL: no hosts matched or all hosts have already failed -- aborting\n", color='red', runner=self.runner)
@ -581,7 +582,7 @@ class PlaybookCallbacks(object):
msg = "TASK: [%s]" % name msg = "TASK: [%s]" % name
if is_conditional: if is_conditional:
msg = "NOTIFIED: [%s]" % name msg = "NOTIFIED: [%s]" % name
if hasattr(self, 'start_at'): if hasattr(self, 'start_at'):
if name == self.start_at or fnmatch.fnmatch(name, self.start_at): if name == self.start_at or fnmatch.fnmatch(name, self.start_at):
# we found out match, we can get rid of this now # we found out match, we can get rid of this now

1
lib/ansible/constants.py
View file

@ -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)