summaryrefslogtreecommitdiff
path: root/ironic/nova
diff options
context:
space:
mode:
authorDevananda van der Veen <devananda.vdv@gmail.com>2014-07-02 12:27:27 -0700
committerDevananda van der Veen <devananda.vdv@gmail.com>2014-07-02 12:31:21 -0700
commitda967d77894be6f23d81fb5cc948f9d13898ba84 (patch)
tree16de02f810ee9a355d1dd656bcebdc831b9389a8 /ironic/nova
parentbe5b79b9dff42c297d3d48d295e029e9f3a62872 (diff)
downloadironic-da967d77894be6f23d81fb5cc948f9d13898ba84.tar.gz
Minor cleanups to nova virt driver and tests
- remove unused classmethod "instance" from nova.virt.ironic driver - two more pep8 fixes in unit tests Change-Id: I0ba4b4717abe8bb8fdb9092c8e07332c3c011a22
Diffstat (limited to 'ironic/nova')
-rw-r--r--ironic/nova/tests/virt/ironic/test_patcher.py2
-rw-r--r--ironic/nova/virt/ironic/driver.py6
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.