x/anvil
Code Issues Proposed changes

Ensure preqs solved before main actions.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-16 12:44:48 -08:00
parent 0a4d183deb
commit d2a57c1f03
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/progs/actions.py
View File

@ -306,11 +306,11 @@ def _run_components(action_name, component_order, components, distro, root_dir,
start_time = time.time() start_time = time.time()
results = list() results = list()
force = program_args.get('force', False) force = program_args.get('force', False)
#activate all preqs first
for component in component_order: for component in component_order:
instance = all_instances[component]
if component in prerequisite_instances: if component in prerequisite_instances:
(preq_action, preq_instance) = prerequisite_instances[component] (preq_action, preq_instance) = prerequisite_instances[component]
LOG.warn("Having to activate prerequisite for component %s of action type %s." % (component, preq_action)) LOG.info("Having to activate prerequisite for component %s of action type %s." % (component, preq_action))
preq_func = action_functor_map[preq_action] preq_func = action_functor_map[preq_action]
preq_result = preq_func(component, preq_instance, force) preq_result = preq_func(component, preq_instance, force)
if preq_result is None: if preq_result is None:
@ -319,6 +319,9 @@ def _run_components(action_name, component_order, components, distro, root_dir,
results.extend(preq_result) results.extend(preq_result)
else: else:
results.append(str(preq_result)) results.append(str(preq_result))
#now do main actions
for component in component_order:
instance = all_instances[component]
main_functor = action_functor_map[action_name] main_functor = action_functor_map[action_name]
main_result = main_functor(component, instance, force) main_result = main_functor(component, instance, force)
if main_result is None: if main_result is None: