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

1 files changed, 12 insertions, 4 deletions

diff --git a/nova/policy.py b/nova/policy.py
index 22551d6a40..ccf1f4624c 100644
--- a/nova/policy.py
+++ b/nova/policy.py
@@ -17,16 +17,24 @@
 
 """Policy Engine For Nova"""
 
+from nova.common import cfg
 from nova.common import policy
 from nova import exception
 from nova import flags
 from nova import utils
 
+
+policy_opts = [
+    cfg.StrOpt('policy_file',
+               default='policy.json',
+               help=_('JSON file representing policy')),
+    cfg.StrOpt('policy_default_rule',
+               default='default',
+               help=_('Rule checked when requested rule is not found')),
+    ]
+
 FLAGS = flags.FLAGS
-flags.DEFINE_string('policy_file', 'policy.json',
-                    _('JSON file representing policy'))
-flags.DEFINE_string('policy_default_rule', 'default',
-                    _('Rule checked when requested rule is not found'))
+FLAGS.add_options(policy_opts)
 
 _POLICY_PATH = None
 _POLICY_CACHE = {}