wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only send event if tqm exists

Browse source 
fixes #13843
This commit is contained in:
Brian Coca 2016-01-13 10:17:43 -05:00
parent 9833051e1e
commit a196c7d737
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -167,6 +167,9 @@ install:
sdist: clean docs sdist: clean docs
$(PYTHON) setup.py sdist $(PYTHON) setup.py sdist
sdist_upload: clean docs
$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
rpmcommon: $(MANPAGES) sdist rpmcommon: $(MANPAGES) sdist
@mkdir -p rpm-build @mkdir -p rpm-build
@cp dist/*.gz rpm-build/ @cp dist/*.gz rpm-build/

2
lib/ansible/executor/playbook_executor.py
View file

@ -112,8 +112,8 @@ class PlaybookExecutor:
salt = var.get("salt", None) salt = var.get("salt", None)
if vname not in self._variable_manager.extra_vars: if vname not in self._variable_manager.extra_vars:
self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default)
if self._tqm: if self._tqm:
self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default)
play.vars[vname] = display.do_var_prompt(vname, private, prompt, encrypt, confirm, salt_size, salt, default) play.vars[vname] = display.do_var_prompt(vname, private, prompt, encrypt, confirm, salt_size, salt, default)
else: # we are either in --list-<option> or syntax check else: # we are either in --list-<option> or syntax check
play.vars[vname] = default play.vars[vname] = default