prep_resize() got an unexpected keyword argument 'filter_properties'

[Dan Prince]

Using the latest Essex master revision 16ea348.

I'm getting the following exception when trying to perform a resize:

2012-01-21 07:25:03,993 ERROR nova.rpc [-] Exception during message handling
(nova.rpc): TRACE: Traceback (most recent call last):
(nova.rpc): TRACE: File "/usr/lib/python2.7/dist-packages/nova/rpc/impl_kombu.py", line 723, in _process_data
(nova.rpc): TRACE: rval = node_func(context=ctxt, **node_args)
(nova.rpc): TRACE: File "/usr/lib/python2.7/dist-packages/nova/exception.py", line 126, in wrapped
(nova.rpc): TRACE: return f(*args, **kw)
(nova.rpc): TRACE: File "/usr/lib/python2.7/dist-packages/nova/compute/manager.py", line 127, in decorated_function
(nova.rpc): TRACE: function(self, context, instance_uuid, *args, **kwargs)
(nova.rpc): TRACE: File "/usr/lib/python2.7/dist-packages/nova/compute/manager.py", line 150, in decorated_function
(nova.rpc): TRACE: self.add_instance_fault_from_exc(context, instance_uuid, e)
(nova.rpc): TRACE: File "/usr/lib/python2.7/contextlib.py", line 24, in __exit__
(nova.rpc): TRACE: self.gen.next()
(nova.rpc): TRACE: File "/usr/lib/python2.7/dist-packages/nova/compute/manager.py", line 145, in decorated_function
(nova.rpc): TRACE: return function(self, context, instance_uuid, *args, **kwargs)
(nova.rpc): TRACE: TypeError: prep_resize() got an unexpected keyword argument 'filter_properties'
(nova.rpc): TRACE:

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/3271
Committed: http://github.com/openstack/nova/commit/255ce807236e9cdfd61357208fbb12b3453b109d
Submitter: Jenkins
Branch: master

commit 255ce807236e9cdfd61357208fbb12b3453b109d
Author: Dan Prince <email address hidden>
Date: Sat Jan 21 17:31:24 2012 -0500

    Allow compute manager prep_resize to accept kwargs

    Fixes issues when trying to resize instances. Fixes LP bug #919642.

    Change-Id: I411d29404902c377088750e1ae4560b8a419d4f2