Error trying to reschedule: unexpected keyword argument 'reservations'

[Dan Prince]

Using the latest Nova Folsom code (as of today) I'm seeing the following stack trace:

2012-08-17 17:32:25 ERROR nova.compute.manager [req-d14f36a9-c4c5-4346-aee5-8b9d61dee29a a528d1e9a7424a4bb4c890cd189103bc 253e3491b90c4dd2addd4273cc581ab3] [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] Error trying to reschedule
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] Traceback (most recent call last):
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] File "/usr/lib/python2.7/site-packages/nova/compute/manager.py", line 580, in _reschedule_or_reraise
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] is_first_time, request_spec, filter_properties)
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] File "/usr/lib/python2.7/site-packages/nova/compute/manager.py", line 616, in _reschedule
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] reservations=None, call=False)
2012-08-17 17:32:25 TRACE nova.compute.manager [instance: 3dc1f4c8-a4e9-4240-b39f-1dfb1ac97fef] TypeError: run_instance() got an unexpected keyword argument 'reservations'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/11572

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/11572
Committed: http://github.com/openstack/nova/commit/d40c75fa16e3a302a90c9edd29be6707012b21bd
Submitter: Jenkins
Branch: master

commit d40c75fa16e3a302a90c9edd29be6707012b21bd
Author: Dan Prince <email address hidden>
Date: Fri Aug 17 14:50:42 2012 -0400

    Fix a TypeError that occurs in _reschedule.

    Updates the compute manager so that it passes the correct
    arguments to the scheduler API's run_instance function.

    Fixes the following exception which will occur if an instance
    is rescheduled:

      TypeError: run_instance() got an unexpected keyword argument
      'reservations'

    As part the fix the FakeSchedulerAPI we use in test_compute.py
    has been updated to match the arguments of the real scheduler API.

    Fixes LP Bug #1038193.

    Change-Id: I25782b79a7b19013b25cb94cc5569b5aa83a2df0