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

Merge pull request #1220 from tbielawa/pause_variables

Browse source 
Fix variable injection in pause module args. Closes #1209
This commit is contained in:
Michael DeHaan 2012-10-04 05:14:41 -07:00
commit 184523ecac
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
lib/ansible/runner/action_plugins/pause.py
View file

@ -18,7 +18,7 @@
from ansible.callbacks import vv from ansible.callbacks import vv
from ansible.errors import AnsibleError as ae from ansible.errors import AnsibleError as ae
from ansible.runner.return_data import ReturnData from ansible.runner.return_data import ReturnData
from ansible.utils import getch from ansible.utils import getch, template, parse_kv
from termios import tcflush, TCIFLUSH from termios import tcflush, TCIFLUSH
import datetime import datetime
import sys import sys
@ -48,42 +48,41 @@ class ActionModule(object):
def run(self, conn, tmp, module_name, module_args, inject): def run(self, conn, tmp, module_name, module_args, inject):
''' run the pause actionmodule ''' ''' run the pause actionmodule '''
args = self.runner.module_args
hosts = ', '.join(map(lambda x: x[1], self.runner.host_set)) hosts = ', '.join(map(lambda x: x[1], self.runner.host_set))
args = parse_kv(template(self.runner.basedir, module_args, inject))
(self.pause_type, sep, pause_params) = args.partition('=') # Are 'minutes' or 'seconds' keys that exist in 'args'?
if 'minutes' in args or 'seconds' in args:
if self.pause_type == '':
self.pause_type = 'prompt'
elif not self.pause_type in self.PAUSE_TYPES:
raise ae("invalid parameter for pause, '%s'. must be one of: %s" % \
(self.pause_type, ", ".join(self.PAUSE_TYPES)))
# error checking
if self.pause_type in ['minutes', 'seconds']:
try: try:
int(pause_params) if 'minutes' in args:
except ValueError: self.pause_type = 'minutes'
raise ae("value given to %s parameter invalid: '%s', must be an integer" % \
self.pause_type, pause_params)
# The time() command operates in seconds so we need to # The time() command operates in seconds so we need to
# recalculate for minutes=X values. # recalculate for minutes=X values.
if self.pause_type == 'minutes': self.seconds = int(args['minutes']) * 60
self.seconds = int(pause_params) * 60 else:
elif self.pause_type == 'seconds': self.pause_type = 'seconds'
self.seconds = int(pause_params) self.seconds = int(args['seconds'])
self.duration_unit = 'seconds' self.duration_unit = 'seconds'
else: except ValueError, e:
# if no args are given we pause with a prompt raise ae("non-integer value given for prompt duration:\n%s" % str(e))
if pause_params == '': # Is 'prompt' a key in 'args'?
elif 'prompt' in args:
self.pause_type = 'prompt'
self.prompt = "[%s]\n%s: " % (hosts, args['prompt'])
# Is 'args' empty, then this is the default prompted pause
elif len(args.keys()) == 0:
self.pause_type = 'prompt'
self.prompt = "[%s]\nPress enter to continue: " % hosts self.prompt = "[%s]\nPress enter to continue: " % hosts
# I have no idea what you're trying to do. But it's so wrong.
else: else:
self.prompt = "[%s]\n%s: " % (hosts, pause_params) raise ae("invalid pause type given. must be one of: %s" % \
", ".join(self.PAUSE_TYPES))
vv("created 'pause' ActionModule: pause_type=%s, duration_unit=%s, calculated_seconds=%s, prompt=%s" % \ vv("created 'pause' ActionModule: pause_type=%s, duration_unit=%s, calculated_seconds=%s, prompt=%s" % \
(self.pause_type, self.duration_unit, self.seconds, self.prompt)) (self.pause_type, self.duration_unit, self.seconds, self.prompt))
########################################################################
# Begin the hard work!
try: try:
self._start() self._start()
if not self.pause_type == 'prompt': if not self.pause_type == 'prompt':