diff --git a/climate/manager/service.py b/climate/manager/service.py index 734dfd53..0293e39a 100644 --- a/climate/manager/service.py +++ b/climate/manager/service.py @@ -14,9 +14,9 @@ # limitations under the License. import datetime -import eventlet import six +import eventlet from oslo.config import cfg from stevedore import enabled diff --git a/climate/notification/notifier.py b/climate/notification/notifier.py index 8690b24a..e03241a4 100644 --- a/climate/notification/notifier.py +++ b/climate/notification/notifier.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from climate.openstack.common import log from oslo.config import cfg from oslo import messaging +from climate.openstack.common import log + notification_opts = [ cfg.StrOpt('publisher_id', default="climate.lease", diff --git a/climate/plugins/instances/vm_plugin.py b/climate/plugins/instances/vm_plugin.py index 28a65505..46caef6d 100644 --- a/climate/plugins/instances/vm_plugin.py +++ b/climate/plugins/instances/vm_plugin.py @@ -14,6 +14,7 @@ # limitations under the License. import eventlet +from novaclient import exceptions as nova_exceptions from oslo.config import cfg from climate import exceptions as climate_exceptions @@ -21,7 +22,6 @@ from climate.openstack.common import log as logging from climate.plugins import base from climate.plugins import instances as plugin from climate.utils.openstack import nova -from novaclient import exceptions as nova_exceptions LOG = logging.getLogger(__name__) diff --git a/climate/plugins/oshosts/host_plugin.py b/climate/plugins/oshosts/host_plugin.py index 6d0340cc..0803d5f4 100644 --- a/climate/plugins/oshosts/host_plugin.py +++ b/climate/plugins/oshosts/host_plugin.py @@ -22,7 +22,6 @@ import uuid from oslo.config import cfg from climate import context - from climate.db import api as db_api from climate.db import exceptions as db_ex from climate.db import utils as db_utils diff --git a/climate/plugins/oshosts/nova_inventory.py b/climate/plugins/oshosts/nova_inventory.py index 30ec5de7..4304506d 100644 --- a/climate/plugins/oshosts/nova_inventory.py +++ b/climate/plugins/oshosts/nova_inventory.py @@ -13,9 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg - from novaclient import exceptions as nova_exceptions +from oslo.config import cfg from climate import context from climate.manager import exceptions as manager_exceptions diff --git a/climate/policy.py b/climate/policy.py index 794a7d3c..64f4c9c6 100644 --- a/climate/policy.py +++ b/climate/policy.py @@ -16,6 +16,7 @@ """Policy Engine For Climate.""" import functools + from oslo.config import cfg from climate import context