diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-16 03:16:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-16 03:16:14 +0000 |
| commit | 71078dfc7177f64e1e79d2e9375c0c99865381b1 (patch) | |
| tree | 67d2b1a53b5690e2cf0f793eb77c83011a9d7f87 /nova/api | |
| parent | 078134882600befbb57c146b613f57dbe659b8ce (diff) | |
| parent | 531ebc04a27b178514296ab662294371070bdebb (diff) | |
Merge "Fix a couple uses of FLAGS"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/services.py | 6 |
1 files changed, 3 insertions, 3 deletions
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']: |