Merge "rename oslo.concurrency to oslo_concurrency"

ironic/common/dhcp_factory.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo_concurrency import lockutils
 import stevedore
 
 from ironic.common import exception

ironic/common/disk_partitioner.py

@@ -15,8 +15,8 @@
 
 import re
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/common/driver_factory.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo_concurrency import lockutils
 from stevedore import dispatch
 
 from ironic.common import exception

ironic/common/images.py

@@ -23,8 +23,8 @@ import os
 import shutil
 
 import jinja2
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/common/utils.py

@@ -29,9 +29,9 @@ import tempfile
 import uuid
 
 import netaddr
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 import paramiko
 import six
 

ironic/conductor/manager.py

@@ -47,11 +47,11 @@ import threading
 
 import eventlet
 from eventlet import greenpool
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.db import exception as db_exception
 from oslo import messaging
 from oslo.utils import excutils
+from oslo_concurrency import lockutils
 
 from ironic.common import dhcp_factory
 from ironic.common import driver_factory

ironic/drivers/modules/console_utils.py

@@ -24,8 +24,8 @@ import subprocess
 import tempfile
 import time
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/deploy_utils.py

@@ -20,9 +20,9 @@ import socket
 import stat
 import time
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from ironic.common import disk_partitioner
 from ironic.common import exception

ironic/drivers/modules/image_cache.py

@@ -22,8 +22,8 @@ import os
 import tempfile
 import time
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo_concurrency import lockutils
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils

ironic/drivers/modules/ipmitool.py

@@ -36,9 +36,9 @@ import stat
 import tempfile
 import time
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/drivers/modules/ssh.py

@@ -28,8 +28,8 @@ Currently supported environments are:
 
 import os
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import boot_devices
 from ironic.common import exception

ironic/nova/compute/manager.py

@@ -23,7 +23,7 @@ work. The goal here is to generalise the areas where n-c talking to a clustered
 hypervisor has issues, and long term fold them into the main ComputeManager.
 """
 
-from oslo.concurrency import lockutils
+from oslo_concurrency import lockutils
 from nova.compute import manager
 import nova.context
 

ironic/tests/drivers/test_console_utils.py

@@ -24,8 +24,8 @@ import subprocess
 import tempfile
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import exception
 from ironic.common import utils

ironic/tests/drivers/test_deploy_utils.py

@@ -19,8 +19,8 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import disk_partitioner
 from ironic.common import exception

ironic/tests/drivers/test_ipmitool.py

@@ -25,8 +25,8 @@ import tempfile
 import time
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from ironic.common import boot_devices
 from ironic.common import driver_factory

ironic/tests/drivers/test_ssh.py

@@ -17,6 +17,8 @@
 
 import fixtures
 import mock
+from oslo.config import cfg
+from oslo_concurrency import processutils
 import paramiko
 
 from ironic.common import boot_devices
@@ -32,8 +34,6 @@ from ironic.tests.db import base as db_base
 from ironic.tests.db import utils as db_utils
 from ironic.tests.objects import utils as obj_utils
 
-from oslo.concurrency import processutils
-from oslo.config import cfg
 
 CONF = cfg.CONF
 

ironic/tests/test_images.py

@@ -20,8 +20,8 @@ import os
 import shutil
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 import six.moves.builtins as __builtin__
 
 from ironic.common import exception

ironic/tests/test_utils.py

@@ -23,8 +23,8 @@ import uuid
 
 import mock
 import netaddr
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 import six
 import six.moves.builtins as __builtin__