summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-11-22 07:00:16 +0000
committerGerrit Code Review <review@openstack.org>2011-11-22 07:00:16 +0000
commit2a45e769b0185a43daa933e9eddd4de30b07ec0a (patch)
treeabfa41fb7a089ca7b4f935a5f401e733c1bcf7f8
parentd0152210600e00a3ff87b83c1af666a2fb7a2abf (diff)
parent10f93f567f4a164091d811765d1fdc39cdb36478 (diff)
downloadnova-2a45e769b0185a43daa933e9eddd4de30b07ec0a.tar.gz
nova-2a45e769b0185a43daa933e9eddd4de30b07ec0a.tar.xz
nova-2a45e769b0185a43daa933e9eddd4de30b07ec0a.zip
Merge "Fixes bug 886263."
-rw-r--r--nova/scheduler/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py
index dae5b1d8f..b4d267172 100644
--- a/nova/scheduler/api.py
+++ b/nova/scheduler/api.py
@@ -352,7 +352,7 @@ class reroute_compute(object):
"""
if 'instance_id' in kwargs:
kwargs['instance_id'] = replacement_id
- elif len(args) > 1:
+ elif len(args) > 2:
args.pop(2)
args.insert(2, replacement_id)