Remove nova.flags

Now that options have all moved from nova.flags to nova.config, we can
safely remove the nova.flags imports and replace them with nova.config
imports.

Change-Id: Ic077a72dd6419bbf1e1babe71acfa43c4e8b55c8

39 files changed, 5 insertions, 38 deletions

diff --git a/nova/virt/baremetal/db/sqlalchemy/migration.py b/nova/virt/baremetal/db/sqlalchemy/migration.py
index 929793e70..d91024a5e 100644
--- a/nova/virt/baremetal/db/sqlalchemy/migration.py
+++ b/nova/virt/baremetal/db/sqlalchemy/migration.py
@@ -22,6 +22,7 @@ from migrate.versioning import util as migrate_util
 import os
 import sqlalchemy
 
+from nova import config
 from nova import exception
 from nova.openstack.common import log as logging
 from nova.virt.baremetal.db import migration
diff --git a/nova/virt/baremetal/dom.py b/nova/virt/baremetal/dom.py
index aef648eb0..48a1eaeeb 100644
--- a/nova/virt/baremetal/dom.py
+++ b/nova/virt/baremetal/dom.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 from nova.compute import power_state
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.virt.baremetal import nodes
diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py
index 4e63d35ed..4d9874e7e 100644
--- a/nova/virt/baremetal/driver.py
+++ b/nova/virt/baremetal/driver.py
@@ -39,7 +39,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import context as nova_context
 from nova import exception
-from nova import flags
 from nova import notifications
 from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
diff --git a/nova/virt/baremetal/nodes.py b/nova/virt/baremetal/nodes.py
index d4bd90100..aa817fdf9 100644
--- a/nova/virt/baremetal/nodes.py
+++ b/nova/virt/baremetal/nodes.py
@@ -17,7 +17,6 @@
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.virt.baremetal import fake
 from nova.virt.baremetal import tilera
diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py
index c0343bac4..e79bc6fb2 100644
--- a/nova/virt/baremetal/tilera.py
+++ b/nova/virt/baremetal/tilera.py
@@ -28,7 +28,6 @@ import time
 from nova.compute import power_state
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py
index 8d7046e18..fda9f201f 100644
--- a/nova/virt/configdrive.py
+++ b/nova/virt/configdrive.py
@@ -23,7 +23,6 @@ import tempfile
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 1c8f15628..e34ca58b5 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -34,7 +34,6 @@ if os.name != 'nt':
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py
index b374ccacc..a6eb77199 100644
--- a/nova/virt/disk/mount/nbd.py
+++ b/nova/virt/disk/mount/nbd.py
@@ -19,7 +19,6 @@ import os
 import time
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.disk.mount import api
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index d5edcffed..12f19bf3b 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -22,7 +22,7 @@ Driver base-classes:
     types that support that contract
 """
 
-from nova import flags
+from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index 808c3302b..7c6e95beb 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -19,7 +19,6 @@
 
 from nova import config
 from nova import context
-from nova import flags
 from nova import network
 from nova.network import linux_net
 from nova.openstack.common import cfg
diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py
index 1bd6ab05f..1fb0d14bb 100644
--- a/nova/virt/hyperv/livemigrationops.py
+++ b/nova/virt/hyperv/livemigrationops.py
@@ -23,7 +23,6 @@ import sys
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import baseops
diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py
index 65b123932..39ba25b30 100644
--- a/nova/virt/hyperv/snapshotops.py
+++ b/nova/virt/hyperv/snapshotops.py
@@ -24,7 +24,6 @@ import sys
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.image import glance
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import baseops
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index d2726f871..39bdc5497 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -22,7 +22,6 @@ import time
 
 from nova import block_device
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py
index b4ec7dc7d..714666620 100644
--- a/nova/virt/hyperv/volumeutils.py
+++ b/nova/virt/hyperv/volumeutils.py
@@ -26,7 +26,6 @@ import time
 
 from nova import block_device
 from nova import config
-from nova import flags
 from nova.openstack.common import log as logging
 from nova.virt import driver
 from nova.virt.hyperv import vmutils
diff --git a/nova/virt/images.py b/nova/virt/images.py
index f0ed3ba68..bc6b21a7b 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -26,7 +26,6 @@ import re
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.image import glance
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index c6c4ddee6..88452f230 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -62,7 +62,6 @@ from nova.compute import vm_mode
 from nova import config
 from nova import context as nova_context
 from nova import exception
-from nova import flags
 from nova.image import glance
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 825a033c7..2e73661f6 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -21,7 +21,6 @@
 from eventlet import tpool
 
 from nova import config
-from nova import flags
 from nova.openstack.common import log as logging
 import nova.virt.firewall as base_firewall
 
diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
index 7152e3e2d..18a8aa910 100644
--- a/nova/virt/libvirt/imagebackend.py
+++ b/nova/virt/libvirt/imagebackend.py
@@ -20,7 +20,6 @@ import contextlib
 import os
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import fileutils
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index 961309929..793044477 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -30,7 +30,6 @@ import time
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 3a307c8e4..9bda95b44 100644
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -28,7 +28,6 @@ from lxml import etree
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import jsonutils
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index f0228de92..feb6e456a 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -21,7 +21,6 @@
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.network import linux_net
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py
index 66ffc2efa..b9b88ce21 100644
--- a/nova/virt/libvirt/volume.py
+++ b/nova/virt/libvirt/volume.py
@@ -22,7 +22,6 @@ import time
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import lockutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/libvirt/volume_nfs.py b/nova/virt/libvirt/volume_nfs.py
index 5dec74e3d..b952baffa 100644
--- a/nova/virt/libvirt/volume_nfs.py
+++ b/nova/virt/libvirt/volume_nfs.py
@@ -22,7 +22,6 @@ import os
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py
index 484cb3db3..8caacbc7d 100644
--- a/nova/virt/netutils.py
+++ b/nova/virt/netutils.py
@@ -24,7 +24,6 @@
 import netaddr
 
 from nova import config
-from nova import flags
 
 CONF = config.CONF
 CONF.import_opt('injected_network_template', 'nova.virt.disk.api')
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index eea6e482d..8bed966d6 100644
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -19,7 +19,6 @@ from nova.compute import vm_states
 
 from nova import config
 from nova import context as nova_context
-from nova import flags
 
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index 6ed7535a7..59b83af04 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -22,7 +22,6 @@ import time
 
 from nova import config
 from nova import exception as nova_exception
-from nova import flags
 from nova import utils
 
 from nova.compute import power_state
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 9a8d350d9..f0673cba2 100644
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -38,7 +38,6 @@ from eventlet import event
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py
index d8840938d..a20863d8c 100644
--- a/nova/virt/vmwareapi/read_write_util.py
+++ b/nova/virt/vmwareapi/read_write_util.py
@@ -27,7 +27,7 @@ import urllib
 import urllib2
 import urlparse
 
-from nova import flags
+from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index c98bde68c..ad7c5d536 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -19,7 +19,6 @@
 
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova.virt import vif
 from nova.virt.vmwareapi import network_utils
diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py
index a03df88e4..2894074d6 100644
--- a/nova/virt/vmwareapi/vim.py
+++ b/nova/virt/vmwareapi/vim.py
@@ -27,7 +27,6 @@ except ImportError:
     suds = None
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.virt.vmwareapi import error_util
 
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index ab1eda134..4cb5b9af6 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -29,7 +29,6 @@ import uuid
 from nova.compute import power_state
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index dac6061a9..bf1ea958d 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -22,7 +22,6 @@ import time
 import uuid
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index ae6c7deb4..edff6934c 100644
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -49,7 +49,6 @@ from eventlet import timeout
 from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py
index 2ecadda4e..48f340e99 100644
--- a/nova/virt/xenapi/firewall.py
+++ b/nova/virt/xenapi/firewall.py
@@ -17,8 +17,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.virt import firewall
diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py
index e236528fe..fe91a762a 100644
--- a/nova/virt/xenapi/pool.py
+++ b/nova/virt/xenapi/pool.py
@@ -24,7 +24,6 @@ import urlparse
 from nova.compute import rpcapi as compute_rpcapi
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 13dc74ba9..e0b7f8e07 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -20,7 +20,6 @@
 """VIF drivers for XenAPI."""
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import vif
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 61d59d83b..5bf4e1148 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -39,7 +39,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova import config
 from nova import exception
-from nova import flags
 from nova.image import glance
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index cdfa3685f..cbbd15e1a 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -33,7 +33,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import context as nova_context
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index 99976e0e6..1ca3ea21f 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -23,7 +23,6 @@ import re
 import string
 
 from nova import config
-from nova import flags
 from nova.openstack.common import log as logging