implemented --step in v2

This commit is contained in:
Brian Coca 2015-07-23 20:47:24 -04:00
parent f6a08ce1ba
commit 88e1ef8c9b
4 changed files with 56 additions and 4 deletions

View file

@ -69,6 +69,7 @@ class StrategyBase:
self._variable_manager = tqm.get_variable_manager() self._variable_manager = tqm.get_variable_manager()
self._loader = tqm.get_loader() self._loader = tqm.get_loader()
self._final_q = tqm._final_q self._final_q = tqm._final_q
self._step = tqm._options.step
self._display = display self._display = display
# internal counters # internal counters
@ -443,3 +444,26 @@ class StrategyBase:
self._notified_handlers[handler_name] = [] self._notified_handlers[handler_name] = []
self._display.debug("done running handlers, result is: %s" % result) self._display.debug("done running handlers, result is: %s" % result)
return result return result
def _take_step(self, task, host=None):
ret=False
if host:
msg = u'Perform task: %s on %s (y/n/c): ' % (task, host)
else:
msg = u'Perform task: %s (y/n/c): ' % task
resp = self._display.prompt(msg)
if resp.lower() in ['y','yes']:
self._display.debug("User ran task")
ret = True
elif resp.lower() in ['c', 'continue']:
self._display.debug("User ran task and cancled step mode")
self._step = False
ret = True
else:
self._display.debug("User skipped task")
self._display.banner(msg)
return ret

View file

@ -84,7 +84,7 @@ class StrategyModule(StrategyBase):
self._display.debug("this host has work to do") self._display.debug("this host has work to do")
# check to see if this host is blocked (still executing a previous task) # check to see if this host is blocked (still executing a previous task)
if not host_name in self._blocked_hosts: if not host_name in self._blocked_hosts or not self._blocked_hosts[host_name]:
# pop the task, mark the host blocked, and queue it # pop the task, mark the host blocked, and queue it
self._blocked_hosts[host_name] = True self._blocked_hosts[host_name] = True
(state, task) = iterator.get_next_task_for_host(host) (state, task) = iterator.get_next_task_for_host(host)
@ -122,6 +122,8 @@ class StrategyModule(StrategyBase):
self._blocked_hosts[host_name] = False self._blocked_hosts[host_name] = False
else: else:
# handle step if needed, skip meta actions as they are used internally
if not self._step or self._take_step(task, host_name):
self._tqm.send_callback('v2_playbook_on_task_start', task, is_conditional=False) self._tqm.send_callback('v2_playbook_on_task_start', task, is_conditional=False)
self._queue_task(host, task, task_vars, play_context) self._queue_task(host, task, task_vars, play_context)

View file

@ -94,6 +94,7 @@ class StrategyModule(StrategyBase):
rvals.append((host, noop_task)) rvals.append((host, noop_task))
return rvals return rvals
# if any hosts are in ITERATING_SETUP, return the setup task # if any hosts are in ITERATING_SETUP, return the setup task
# while all other hosts get a noop # while all other hosts get a noop
if num_setups: if num_setups:
@ -142,6 +143,10 @@ class StrategyModule(StrategyBase):
host_results = [] host_results = []
host_tasks = self._get_next_task_lockstep(hosts_left, iterator) host_tasks = self._get_next_task_lockstep(hosts_left, iterator)
# skip control
skip_rest = False
choose_step = True
for (host, task) in host_tasks: for (host, task) in host_tasks:
if not task: if not task:
continue continue
@ -149,6 +154,7 @@ class StrategyModule(StrategyBase):
run_once = False run_once = False
work_to_do = True work_to_do = True
# test to see if the task across all hosts points to an action plugin which # test to see if the task across all hosts points to an action plugin which
# sets BYPASS_HOST_LOOP to true, or if it has run_once enabled. If so, we # sets BYPASS_HOST_LOOP to true, or if it has run_once enabled. If so, we
# will only send this task to the first host in the list. # will only send this task to the first host in the list.
@ -183,6 +189,14 @@ class StrategyModule(StrategyBase):
else: else:
raise AnsibleError("invalid meta action requested: %s" % meta_action, obj=task._ds) raise AnsibleError("invalid meta action requested: %s" % meta_action, obj=task._ds)
else: else:
# handle step if needed, skip meta actions as they are used internally
if self._step and choose_step:
if self._take_step(task):
choose_step = False
else:
break
skip_rest = True
self._display.debug("getting variables") self._display.debug("getting variables")
task_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, host=host, task=task) task_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, host=host, task=task)
task_vars = self.add_tqm_variables(task_vars, play=iterator._play) task_vars = self.add_tqm_variables(task_vars, play=iterator._play)
@ -210,6 +224,10 @@ class StrategyModule(StrategyBase):
if run_once: if run_once:
break break
# go to next host/task group
if skip_rest:
continue
self._display.debug("done queuing things up, now waiting for results queue to drain") self._display.debug("done queuing things up, now waiting for results queue to drain")
results = self._wait_on_pending_results(iterator) results = self._wait_on_pending_results(iterator)
host_results.extend(results) host_results.extend(results)

View file

@ -201,3 +201,11 @@ class Display:
self.display(new_msg, color='red', stderr=True) self.display(new_msg, color='red', stderr=True)
self._errors[new_msg] = 1 self._errors[new_msg] = 1
def prompt(self, msg):
if sys.stdout.encoding:
msg = to_bytes(msg, sys.stdout.encoding)
else:
msg = to_bytes(msg)
return raw_input(msg)