Adding default on vars_prompt

This commit is contained in:
Rodney Quillo 2013-01-18 19:00:57 +08:00
commit 7ae100611c
6 changed files with 22 additions and 8 deletions

View file

@ -435,7 +435,7 @@ class PlaybookCallbacks(object):
print banner(msg)
call_callback_module('playbook_on_task_start', name, is_conditional)
def on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None):
def on_vars_prompt(self, varname, default=None, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None):
if prompt:
msg = "%s: " % prompt
@ -458,10 +458,17 @@ class PlaybookCallbacks(object):
else:
result = prompt(msg, private)
# if result is false and default is not None
if not result and default:
result = default
if encrypt:
result = utils.do_encrypt(result,encrypt,salt_size,salt)
call_callback_module('playbook_on_vars_prompt', varname, private=private, prompt=prompt, encrypt=encrypt, confirm=confirm, salt_size=salt_size, salt=None)
call_callback_module( 'playbook_on_vars_prompt', varname, default=default, private=private,
prompt=prompt, encrypt=encrypt, confirm=confirm, salt_size=salt_size, salt=None
)
return result