From 531ebc04a27b178514296ab662294371070bdebb Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 15 Nov 2012 23:10:22 +0000 Subject: Fix a couple uses of FLAGS The services API extension was still using FLAGS. And baremetal virt driver define FLAGS but never used it. Change-Id: I95c78d04f9103f13c09cbdbc23d6d4ed0d39dde8 --- nova/api/openstack/compute/contrib/services.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 3da00a8c8..6c3a6688d 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -21,9 +21,9 @@ import webob.exc from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil +from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils @@ -31,7 +31,7 @@ from nova import utils LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'services') -FLAGS = flags.FLAGS +CONF = config.CONF class ServicesIndexTemplate(xmlutil.TemplateBuilder): @@ -83,7 +83,7 @@ class ServiceController(object): svcs = [] for svc in services: delta = now - (svc['updated_at'] or svc['created_at']) - alive = abs(utils.total_seconds(delta)) <= FLAGS.service_down_time + alive = abs(utils.total_seconds(delta)) <= CONF.service_down_time art = (alive and "up") or "down" active = 'enabled' if svc['disabled']: -- cgit