summaryrefslogtreecommitdiffstats
path: root/nova/cert
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-15 19:41:58 -0500
committerMark McLoughlin <markmc@redhat.com>2012-11-17 16:30:03 +0000
commit6e92a67fc3e6dcd587e3fd225b7142bc74116e52 (patch)
tree0c25405e1b7bd383c3801244645be8b76b408e40 /nova/cert
parent0e932e6b2390ee8731134cfdb1dcdea3adfc8062 (diff)
downloadnova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.tar.gz
nova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.tar.xz
nova-6e92a67fc3e6dcd587e3fd225b7142bc74116e52.zip
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
Diffstat (limited to 'nova/cert')
-rw-r--r--nova/cert/manager.py2
-rw-r--r--nova/cert/rpcapi.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/cert/manager.py b/nova/cert/manager.py
index d23a15450..0d0e795c7 100644
--- a/nova/cert/manager.py
+++ b/nova/cert/manager.py
@@ -26,8 +26,8 @@ Cert manager manages x509 certificates.
import base64
+from nova import config
from nova import crypto
-from nova import flags
from nova import manager
from nova.openstack.common import log as logging
diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py
index f6ba11579..7665f544c 100644
--- a/nova/cert/rpcapi.py
+++ b/nova/cert/rpcapi.py
@@ -19,7 +19,6 @@ Client side of the cert manager RPC API.
"""
from nova import config
-from nova import flags
import nova.openstack.common.rpc.proxy
CONF = config.CONF