Merge "Minor cleanups to nova virt driver and tests"

2 files changed, 0 insertions, 8 deletions

diff --git a/ironic/nova/tests/virt/ironic/test_patcher.py b/ironic/nova/tests/virt/ironic/test_patcher.py
index e3a58a781..dde4f415c 100644
--- a/ironic/nova/tests/virt/ironic/test_patcher.py
+++ b/ironic/nova/tests/virt/ironic/test_patcher.py
@@ -18,10 +18,8 @@ from oslo.config import cfg
 from ironic.nova.virt.ironic import patcher
 from ironic.nova.tests.virt.ironic import utils as ironic_utils
 
-from nova import exception
 from nova import context as nova_context
 from nova import test
-from nova.objects.flavor import Flavor as flavor_obj
 from nova.tests import fake_instance
 
 CONF = cfg.CONF
diff --git a/ironic/nova/virt/ironic/driver.py b/ironic/nova/virt/ironic/driver.py
index 2591a5dba..6c62f8b27 100644
--- a/ironic/nova/virt/ironic/driver.py
+++ b/ironic/nova/virt/ironic/driver.py
@@ -308,12 +308,6 @@ class IronicDriver(virt_driver.ComputeDriver):
 
         _log_ironic_polling('become ACTIVE', node, instance)
 
-    @classmethod
-    def instance(cls):
-        if not hasattr(cls, '_instance'):
-            cls._instance = cls()
-        return cls._instance
-
     def init_host(self, host):
         """Initialize anything that is necessary for the driver to function.