cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Misc cleanup -- moved function out of utils, removed debug statement.

Browse source
This commit is contained in:
Michael DeHaan 2012-07-15 08:50:23 -04:00
parent 19a2fc00dc
commit 706cfd9ade
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/callbacks.py
View file

@ -239,7 +239,10 @@ class PlaybookCallbacks(object):
pass pass
def on_task_start(self, name, is_conditional): def on_task_start(self, name, is_conditional):
print banner(utils.task_start_msg(name, is_conditional)) msg = "TASK: [%s]" % name
if is_conditional:
msg = "NOTIFIED: [%s]" % name
print banner(msg)
def on_vars_prompt(self, varname, private=True): def on_vars_prompt(self, varname, private=True):
msg = 'input for %s: ' % varname msg = 'input for %s: ' % varname

1
lib/ansible/playbook/play.py
View file

@ -64,7 +64,6 @@ class Play(object):
self.transport = ds.get('connection', self.playbook.transport) self.transport = ds.get('connection', self.playbook.transport)
self.tags = ds.get('tags', None) self.tags = ds.get('tags', None)
self.gather_facts = ds.get('gather_facts', True) self.gather_facts = ds.get('gather_facts', True)
print "self.gather_facts: %s" % self.gather_facts
self._update_vars_files_for_host(None) self._update_vars_files_for_host(None)

7
lib/ansible/utils.py
View file

@ -63,13 +63,6 @@ def smjson(result):
result2 = result.copy() result2 = result.copy()
return json.dumps(result2, sort_keys=True) return json.dumps(result2, sort_keys=True)
def task_start_msg(name, conditional):
# FIXME: move to callbacks code
if conditional:
return "NOTIFIED: [%s]" % name
else:
return "TASK: [%s]" % name
def regular_generic_msg(hostname, result, oneline, caption): def regular_generic_msg(hostname, result, oneline, caption):
''' output on the result of a module run that is not command ''' ''' output on the result of a module run that is not command '''
if not oneline: if not oneline: