diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-06-28 08:53:13 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-06-28 08:53:13 -0700 |
| commit | 37e86a230720921488ae19fc2ca92667e8be4485 (patch) | |
| tree | 47bd5a9bfac34732dbf54d09f9f68de7c6829437 | |
| parent | b497b7b95124fa52259637d0fc1a67f4ff625b0c (diff) | |
| download | nova-37e86a230720921488ae19fc2ca92667e8be4485.tar.gz nova-37e86a230720921488ae19fc2ca92667e8be4485.tar.xz nova-37e86a230720921488ae19fc2ca92667e8be4485.zip | |
change variable names to remove future conflict with sandy's zone-offsets branch
| -rw-r--r-- | nova/scheduler/zone_aware_scheduler.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py index 2efad7bf2..2e6662a79 100644 --- a/nova/scheduler/zone_aware_scheduler.py +++ b/nova/scheduler/zone_aware_scheduler.py @@ -192,9 +192,10 @@ class ZoneAwareScheduler(driver.Scheduler): for num in xrange(num_instances): if not build_plan: break - item = build_plan.pop(0) - self._provision_resource(context, item, instance_id, - request_spec, kwargs) + + build_plan_item = build_plan.pop(0) + self._provision_resource(context, build_plan_item, instance_id, + request_spec, kwargs) # Returning None short-circuits the routing to Compute (since # we've already done it here) |