From 68f3803ae794328f8f659cd21e11a0c122776a8d Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Tue, 5 Jul 2016 17:53:04 +0300
Subject: [PATCH] cleanup nova.conf usage

CONF option imports are no longer necessary.

Change-Id: I5d40db4d6253df1797d7846ed993229e06877c4a
---
 hyperv/nova/hostops.py    | 4 ++--
 hyperv/nova/imagecache.py | 4 ----
 hyperv/nova/pathutils.py  | 1 -
 hyperv/nova/vif.py        | 1 -
 hyperv/nova/vmops.py      | 2 +-
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/hyperv/nova/hostops.py b/hyperv/nova/hostops.py
index 9353a80c..653696b5 100644
--- a/hyperv/nova/hostops.py
+++ b/hyperv/nova/hostops.py
@@ -26,6 +26,7 @@ from nova.compute import arch
 from nova.compute import hv_type
 from nova.compute import vm_mode
 from nova.compute import vm_states
+import nova.conf
 from nova import context
 from nova import exception
 from nova import objects
@@ -48,9 +49,8 @@ hyper_host_opts = [
                     'evacuated during host maintenance.'),
 ]
 
-CONF = cfg.CONF
+CONF = nova.conf.CONF
 CONF.register_opts(hyper_host_opts, 'hyperv')
-CONF.import_opt('enable_remotefx', 'hyperv.nova.vmops', 'hyperv')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/hyperv/nova/imagecache.py b/hyperv/nova/imagecache.py
index 9973da58..0578d69b 100644
--- a/hyperv/nova/imagecache.py
+++ b/hyperv/nova/imagecache.py
@@ -35,10 +35,6 @@ from hyperv.nova import pathutils
 LOG = logging.getLogger(__name__)
 
 CONF = nova.conf.CONF
-CONF.import_opt('use_cow_images', 'nova.virt.driver')
-CONF.import_opt('instances_path', 'nova.compute.manager')
-CONF.import_opt('remove_unused_original_minimum_age_seconds',
-                'nova.virt.imagecache')
 
 
 def synchronize_with_path(f):
diff --git a/hyperv/nova/pathutils.py b/hyperv/nova/pathutils.py
index 9b8c7d5c..5123f67b 100644
--- a/hyperv/nova/pathutils.py
+++ b/hyperv/nova/pathutils.py
@@ -29,7 +29,6 @@ from hyperv.nova import constants
 LOG = logging.getLogger(__name__)
 
 CONF = nova.conf.CONF
-CONF.import_opt('instances_path', 'nova.compute.manager')
 
 ERROR_INVALID_NAME = 123
 
diff --git a/hyperv/nova/vif.py b/hyperv/nova/vif.py
index bfaa60c9..8d5aeeaa 100644
--- a/hyperv/nova/vif.py
+++ b/hyperv/nova/vif.py
@@ -24,7 +24,6 @@ from os_win import utilsfactory
 from hyperv.nova import ovsutils
 
 CONF = nova.conf.CONF
-CONF.import_opt('network_api_class', 'nova.network')
 
 
 class HyperVBaseVIFDriver(object):
diff --git a/hyperv/nova/vmops.py b/hyperv/nova/vmops.py
index fdd3af4e..d60bdf9c 100644
--- a/hyperv/nova/vmops.py
+++ b/hyperv/nova/vmops.py
@@ -55,8 +55,8 @@ from hyperv.nova import volumeops
 
 LOG = logging.getLogger(__name__)
 
+
 CONF = nova.conf.CONF
-CONF.import_opt('use_cow_images', 'nova.virt.driver')
 
 SHUTDOWN_TIME_INCREMENT = 5
 REBOOT_TYPE_SOFT = 'SOFT'