From 03b6cc9a87f891fe0ab0019471cb890ea53ae9ea Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 17 Nov 2012 16:29:37 +0000
Subject: Make fping extension use CONF

FLAGS is being removed in favour of CONF.

Change-Id: Id6b8f3d1bdff6714b49005e0b515f4395772a215
---
 nova/api/openstack/compute/contrib/fping.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py
index 3ae876f5a..890119570 100644
--- a/nova/api/openstack/compute/contrib/fping.py
+++ b/nova/api/openstack/compute/contrib/fping.py
@@ -25,8 +25,8 @@ from webob import exc
 from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
@@ -42,8 +42,8 @@ fping_opts = [
                help="Full path to fping."),
 ]
 
-FLAGS = flags.FLAGS
-FLAGS.register_opts(fping_opts)
+CONF = config.CONF
+CONF.register_opts(fping_opts)
 
 
 class FpingController(object):
@@ -53,13 +53,13 @@ class FpingController(object):
         self.last_call = {}
 
     def check_fping(self):
-        if not os.access(FLAGS.fping_path, os.X_OK):
+        if not os.access(CONF.fping_path, os.X_OK):
             raise exc.HTTPServiceUnavailable(
                 explanation=_("fping utility is not found."))
 
     @staticmethod
     def fping(ips):
-        fping_ret = utils.execute(FLAGS.fping_path, *ips,
+        fping_ret = utils.execute(CONF.fping_path, *ips,
                                   check_exit_code=False)
         if not fping_ret:
             return set()
-- 
cgit