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

allow for vars_prompt and pause prompt to be skipped in non interactive settings

Browse source 
ansible-pull users rejoice
This commit is contained in:
Brian Coca 2015-08-06 19:19:46 -04:00
parent ce52fdebe8
commit a555a0652e
2 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -238,6 +238,7 @@ class PlaybookExecutor:
def _do_var_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): def _do_var_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None):
if sys.__stdin__.isatty():
if prompt and default is not None: if prompt and default is not None:
msg = "%s [%s]: " % (prompt, default) msg = "%s [%s]: " % (prompt, default)
elif prompt: elif prompt:
@ -266,6 +267,9 @@ class PlaybookExecutor:
self._display.display("***** VALUES ENTERED DO NOT MATCH ****") self._display.display("***** VALUES ENTERED DO NOT MATCH ****")
else: else:
result = do_prompt(msg, private) result = do_prompt(msg, private)
else:
result = None
self._display.warning("Not prompting as we are not in interactive mode")
# if result is false and default is not None # if result is false and default is not None
if not result and default is not None: if not result and default is not None:

6
lib/ansible/plugins/action/pause.py
View file

@ -24,6 +24,7 @@ import termios
import time import time
import tty import tty
from os import isatty
from ansible.errors import * from ansible.errors import *
from ansible.plugins.action import ActionBase from ansible.plugins.action import ActionBase
@ -106,6 +107,7 @@ class ActionModule(ActionBase):
# save the attributes on the existing (duped) stdin so # save the attributes on the existing (duped) stdin so
# that we can restore them later after we set raw mode # that we can restore them later after we set raw mode
fd = self._connection._new_stdin.fileno() fd = self._connection._new_stdin.fileno()
if isatty(fd):
old_settings = termios.tcgetattr(fd) old_settings = termios.tcgetattr(fd)
tty.setraw(fd) tty.setraw(fd)
@ -120,6 +122,9 @@ class ActionModule(ActionBase):
raise KeyboardInterrupt raise KeyboardInterrupt
if not seconds: if not seconds:
if not isatty(fd):
self._display.warning("Not waiting from prompt as stdin is not interactive")
break
# read key presses and act accordingly # read key presses and act accordingly
if key_pressed == '\r': if key_pressed == '\r':
break break
@ -143,6 +148,7 @@ class ActionModule(ActionBase):
finally: finally:
# cleanup and save some information # cleanup and save some information
# restore the old settings for the duped stdin fd # restore the old settings for the duped stdin fd
if isatty(fd):
termios.tcsetattr(fd, termios.TCSADRAIN, old_settings) termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
duration = time.time() - start duration = time.time() - start