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

36 files changed, 17 insertions, 36 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index 1562aeede..167c897cf 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -23,7 +23,6 @@ import webob.exc
 
 from nova import config
 from nova import context
-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/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 1bf1f9f70..a4a52a22a 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -34,7 +34,6 @@ from nova.api import validator
 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 importutils
 from nova.openstack.common import jsonutils
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 6cd7c4431..c3b2065b4 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -25,8 +25,8 @@ import datetime
 from xml.dom import minidom
 
 from nova.api.ec2 import ec2utils
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 9d73673a4..a061931b0 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -36,7 +36,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.image import s3
 from nova import network
 from nova.openstack.common import log as logging
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index 997197d38..238bbecb9 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -18,10 +18,10 @@
 
 import re
 
+from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.network import model as network_model
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py
index 331603a3a..fd2e46fcd 100644
--- a/nova/api/ec2/faults.py
+++ b/nova/api/ec2/faults.py
@@ -17,7 +17,6 @@ import webob.exc
 
 from nova import config
 from nova import context
-from nova import flags
 from nova import utils
 
 CONF = config.CONF
diff --git a/nova/api/manager.py b/nova/api/manager.py
index dc081d9a6..d74e0ad24 100644
--- a/nova/api/manager.py
+++ b/nova/api/manager.py
@@ -17,7 +17,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 from nova import manager
 from nova.openstack.common import importutils
 
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 6fd8b1374..937938b40 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -28,7 +28,6 @@ from nova import block_device
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova import network
 from nova.openstack.common import cfg
 from nova.virt import netutils
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 14ec696cd..434d8deba 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -25,7 +25,6 @@ import webob.exc
 from nova.api.metadata import base
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import wsgi
 
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 78064012b..4d680fa94 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -23,7 +23,6 @@ import webob.exc
 from nova.api.openstack import wsgi
 from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 50ac76179..38247a55b 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -30,7 +30,6 @@ from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import quota
 
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index e6704951f..dc18a01a5 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -32,7 +32,6 @@ from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index e6a1e9c4d..fc2943380 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -23,7 +23,6 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 from nova.api.openstack import extensions
 from nova import config
-from nova import flags
 from nova.openstack.common import log as logging
 
 
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index 1bac0851d..3614d7ba1 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -23,8 +23,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova.compute import vm_states
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index c05a208a3..c53fdabd5 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -20,7 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
-from nova import flags
+from nova import config
 from nova import network
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index 77d88144a..302ff7cf3 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -24,7 +24,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova import network
 from nova.openstack.common import fileutils
 from nova.openstack.common import log as logging
diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py
index ac294f660..b972cf9b9 100644
--- a/nova/api/openstack/compute/contrib/config_drive.py
+++ b/nova/api/openstack/compute/contrib/config_drive.py
@@ -21,7 +21,7 @@ from nova.api.openstack.compute import servers
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import flags
+from nova import config
 
 authorize = extensions.soft_extension_authorizer('compute', 'config_drive')
 
diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py
index 15f6456ea..06847c727 100644
--- a/nova/api/openstack/compute/contrib/extended_server_attributes.py
+++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py
@@ -18,8 +18,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
+from nova import config
 from nova import db
-from nova import flags
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py
index f7ccdcbff..55ff930f2 100644
--- a/nova/api/openstack/compute/contrib/extended_status.py
+++ b/nova/api/openstack/compute/contrib/extended_status.py
@@ -18,7 +18,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova import flags
+from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 237872405..32582548c 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -23,9 +23,9 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api as compute_api
+from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
index 7c98cb8d6..31a66b8fe 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -23,7 +23,6 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import config
 from nova import db
-from nova import flags
 from nova import utils
 
 CONF = config.CONF
diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py
index 4537e1ec7..e7b7ac8a6 100644
--- a/nova/api/openstack/compute/contrib/networks.py
+++ b/nova/api/openstack/compute/contrib/networks.py
@@ -21,8 +21,8 @@ import webob
 from webob import exc
 
 from nova.api.openstack import extensions
+from nova import config
 from nova import exception
-from nova import flags
 from nova import network
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 054eaf870..b76b54e8b 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -23,7 +23,6 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import utils
 
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index b86397694..ac5206a63 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -27,9 +27,9 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import api as compute_api
+from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index f6e9a63f6..c51faef1b 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -22,8 +22,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 
 authorize_show = extensions.extension_authorizer('compute',
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index 39792771c..c58a70d3c 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -24,8 +24,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import utils
 from nova import volume
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index c46a6b034..4805ba4e6 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -17,7 +17,6 @@
 
 from nova.api.openstack import extensions as base_extensions
 from nova import config
-from nova import flags
 from nova.openstack.common import log as logging
 from nova.openstack.common.plugin import pluginmanager
 
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py
index 3bc817076..375bbc4d5 100644
--- a/nova/api/openstack/compute/image_metadata.py
+++ b/nova/api/openstack/compute/image_metadata.py
@@ -19,8 +19,8 @@ from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import wsgi
+from nova import config
 from nova import exception
-from nova import flags
 from nova.image import glance
 
 
diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py
index 0c280618e..bdd0e0916 100644
--- a/nova/api/openstack/compute/images.py
+++ b/nova/api/openstack/compute/images.py
@@ -19,8 +19,8 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import images as views_images
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova import config
 from nova import exception
-from nova import flags
 import nova.image.glance
 from nova.openstack.common import log as logging
 import nova.utils
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index ec9759759..a01066d0e 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -22,7 +22,7 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import flags
+from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index d8d2f1c28..2c22ccc48 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -32,7 +32,6 @@ from nova import compute
 from nova.compute import instance_types
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common
diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py
index ec5fda64a..c5ccb02fd 100644
--- a/nova/api/openstack/compute/views/addresses.py
+++ b/nova/api/openstack/compute/views/addresses.py
@@ -18,7 +18,7 @@
 import itertools
 
 from nova.api.openstack import common
-from nova import flags
+from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py
index d1d7d008f..228af7c8d 100644
--- a/nova/api/openstack/compute/views/images.py
+++ b/nova/api/openstack/compute/views/images.py
@@ -19,7 +19,6 @@ import os.path
 
 from nova.api.openstack import common
 from nova import config
-from nova import flags
 from nova import utils
 
 CONF = config.CONF
diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py
index 826c8b4a5..594369490 100644
--- a/nova/api/openstack/compute/views/versions.py
+++ b/nova/api/openstack/compute/views/versions.py
@@ -20,7 +20,6 @@ import os
 
 from nova.api.openstack import common
 from nova import config
-from nova import flags
 
 
 CONF = config.CONF
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 298e98603..b44ebefbb 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -24,8 +24,8 @@ import webob.exc
 import nova.api.openstack
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 import nova.policy
diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py
index 1d22e74fc..95fa381ff 100644
--- a/nova/api/sizelimit.py
+++ b/nova/api/sizelimit.py
@@ -22,7 +22,6 @@ import webob.dec
 import webob.exc
 
 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 wsgi