TypeError: _instance_action() got an unexpected keyword argument 'clean_shutdown'

[melanie witt]

Calls to resize_instance in cells fail with the following trace:

2015-03-17 20:22:51.152 ERROR oslo_messaging.rpc.dispatcher [req-a7006e81-683f-4397-ac73-d931565e7cfb MigrationsAdminTest-1202257631 MigrationsAdminTest-955888068] Exception during message handling: _instance_action() got an unexpected keyword argument 'clean_shutdown'
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher Traceback (most recent call last):
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 142, in _dispatch_and_reply
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher executor_callback))
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 186, in _dispatch
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher executor_callback)
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 130, in _do_dispatch
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher result = func(ctxt, **new_args)
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher File "/opt/stack/nova/nova/cells/manager.py", line 533, in resize_instance
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher clean_shutdown=clean_shutdown)
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher File "/opt/stack/nova/nova/cells/messaging.py", line 1780, in resize_instance
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher clean_shutdown=clean_shutdown)
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher TypeError: _instance_action() got an unexpected keyword argument 'clean_shutdown'
2015-03-17 20:22:51.152 TRACE oslo_messaging.rpc.dispatcher

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/167845
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=5cb3ec11d5c450ca1c931475ed507168500c1c22
Submitter: Jenkins
Branch: master

commit 5cb3ec11d5c450ca1c931475ed507168500c1c22
Author: melanie witt <email address hidden>
Date: Wed Mar 25 23:58:13 2015 +0000

    Fix _instance_action call for resize_instance in cells

    Keyword arguments for the _instance_action function are expected to
    be bundled inside the 'extra_kwargs' keyword argument. The kwarg
    "clean_shutdown" was being passed separately, resulting in a
    TypeError for the unexpected keyword argument.

    Closes-Bug: #1436613

    Change-Id: I7a40ed8a55bd81332aea3e85985c853edea4b3ab