From 82049af90e86380043c59741fa4e1cd2cf24aaa7 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 23 Jan 2012 11:51:14 +0000
Subject: Refactor away the flags.DEFINE_* helpers

The next obvious step in porting to cfg is to define all options using
cfg schemas directly rather than using the flags.DEFINE_* helpers.

This is a large change, but it is almost entirely pure refactoring and
does not result in any functional changes.

The only change to note is that the default values for glance_host,
glance_api_servers and default_publisher_id options are now using opt
value interpolation i.e.

 -glance_host=_get_my_ip()
 +glance_host='$my_ip'

 -glance_api_servers=['%s:%d' % (FLAGS.glance_host, FLAGS.glance_port)]
 +glance_api_servers=['$glance_host:$glance_port']

 -default_publisher_id=FLAGS.host
 +default_publisher_id='$host'

Also note that the lower_bound check on the {report,periodic}_interval
options are no more, but this has been true since cfg was first added.

Change-Id: Ia58c8f0aaf61628bb55b1b8485118a2a9852ed17
---
 nova/ipv6/api.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'nova/ipv6')

diff --git a/nova/ipv6/api.py b/nova/ipv6/api.py
index da003645a..5931b8ba6 100644
--- a/nova/ipv6/api.py
+++ b/nova/ipv6/api.py
@@ -14,14 +14,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from nova.common import cfg
 from nova import flags
 from nova import utils
 
 
+ipv6_backend_opt = \
+    cfg.StrOpt('ipv6_backend',
+               default='rfc2462',
+               help='Backend to use for IPv6 generation')
+
 FLAGS = flags.FLAGS
-flags.DEFINE_string('ipv6_backend',
-                    'rfc2462',
-                    'Backend to use for IPv6 generation')
+FLAGS.add_option(ipv6_backend_opt)
 
 
 def reset_backend():
-- 
cgit