summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-10 21:13:11 +0000
committerGerrit Code Review <review@openstack.org>2012-02-10 21:13:11 +0000
commit754320ec661c628d1a7263dc34fd98d6554e652b (patch)
treee255c5b2267080eee3dff05e85967f47ebf7e50a /nova/utils.py
parentf6f8d96b2686733800ffcd804a490f44ea707185 (diff)
parentd1888a3359345acffd8d0845c137eefd88072112 (diff)
downloadnova-754320ec661c628d1a7263dc34fd98d6554e652b.tar.gz
nova-754320ec661c628d1a7263dc34fd98d6554e652b.tar.xz
nova-754320ec661c628d1a7263dc34fd98d6554e652b.zip
Merge "Remove the last of the gflags shim layer"
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 674be4a04..7bbfed1e0 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -57,8 +57,7 @@ ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
FLAGS = flags.FLAGS
-
-FLAGS.add_option(
+FLAGS.register_opt(
cfg.BoolOpt('disable_process_locking', default=False,
help='Whether to disable inter-process locks'))
@@ -572,7 +571,7 @@ class LazyPluggable(object):
def __get_backend(self):
if not self.__backend:
- backend_name = self.__pivot.value
+ backend_name = FLAGS[self.__pivot]
if backend_name not in self.__backends:
raise exception.Error(_('Invalid backend: %s') % backend_name)