ironic_host_manager's consume_from_instance() takes exactly 2 arguments (3 given)

[aeva black]

https://review.openstack.org/#/c/118391/
Change-id I012ee5c118265e044ff41fb58b732728946ee85a

included a change to the definition of nova/scheduler/host_manager.py HostState.consume_from_instance(), changing the method from requiring 2 to 3 parameters.

This change did not update the ironic_host_manager's HostState class, thus breaking it.

This has broken Ironic's tempest tests, resulting in all our CI tests failing.

[OpenStack Infra (hudson-openstack)]

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

[aeva black (tenbrae)]

For reference, here's the TRACE output from nova-scheduler:

2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher Traceback (most recent call last):
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 134, in _dispatch_and_reply
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher incoming.message))
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 177, in _dispatch
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher return self._do_dispatch(endpoint, method, ctxt, args)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 123, in _do_dispatch
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher result = getattr(endpoint, method)(ctxt, **new_args)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/server.py", line 139, in inner
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher return func(*args, **kwargs)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/opt/stack/new/nova/nova/scheduler/manager.py", line 175, in select_destinations
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher filter_properties)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/opt/stack/new/nova/nova/scheduler/filter_scheduler.py", line 147, in select_destinations
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher filter_properties)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher File "/opt/stack/new/nova/nova/scheduler/filter_scheduler.py", line 300, in _schedule
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher chosen_host.obj.consume_from_instance(context, instance_properties)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher TypeError: consume_from_instance() takes exactly 2 arguments (3 given)
2014-09-14 17:06:58.068 31399 TRACE oslo.messaging.rpc.dispatcher

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sean Dague (<email address hidden>) on branch: master
Review: https://review.openstack.org/121421
Reason: Duplicate of https://review.openstack.org/#/c/121397/