nova.objects.base imports conductor wrong

[Sam Morrison]

in nova.objects.base it imports conductor

from nova.conductor import api as conductor_api
self._conductor = conductor_api.API()

This bypasses the logic to detemin whether to use conductor RPC service or not.

Should do

from nova import conductor
self._conductor = conductor.API()

[Sam Morrison (sorrison)]

https://review.openstack.org/#/c/88123/

[Openstack Gerrit (openstack-gerrit)]

Reviewed: https://review.openstack.org/88123
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=5427630f735381569066815605c75bccd278def8
Submitter: Jenkins
Branch: master

commit 5427630f735381569066815605c75bccd278def8
Author: Sam Morrison <email address hidden>
Date: Thu Apr 17 12:03:10 2014 +1000

    Fix up import of conductor

    Need to import API from nova.conductor not from nova.conductor.api
    directly. This is needed so the is_local flag can be used to
    determine the conductor API to use (local or rpc)

    Change-Id: I9a45a705a39050b296936edc486db5c2f0aae4dc
    Closes-Bug: #1308811