diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-04 21:32:45 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-04 21:46:35 +0000 |
| commit | 637e805634b5179ffacad57ee26d4175449537f5 (patch) | |
| tree | c0ff2f32d3f2957ae7b96a2eedc35b0029917048 /nova/flags.py | |
| parent | 8ce58defbe560b1da34d991b38ac64a9b4c8d654 (diff) | |
| download | nova-637e805634b5179ffacad57ee26d4175449537f5.tar.gz nova-637e805634b5179ffacad57ee26d4175449537f5.tar.xz nova-637e805634b5179ffacad57ee26d4175449537f5.zip | |
Switch from FLAGS to CONF in misc modules
Use the global CONF variable instead of FLAGS. This is purely a cleanup
since FLAGS is already just another reference to CONF.
We leave the nova.flags imports until a later cleanup commit since
removing them may cause unpredictable problems due to config options not
being registered.
Change-Id: Ib110ba8d1837780e90b0d3fe13f8e6b68ed15f65
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nova/flags.py b/nova/flags.py index e3a33de12..497d65ca7 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -30,10 +30,11 @@ import os import socket import sys +from nova import config from nova.openstack.common import cfg - -FLAGS = cfg.CONF +CONF = config.CONF +FLAGS = CONF def _get_my_ip(): @@ -88,8 +89,8 @@ debug_opts = [ help='Add python stack traces to SQL as comment strings'), ] -FLAGS.register_cli_opts(core_opts) -FLAGS.register_cli_opts(debug_opts) +CONF.register_cli_opts(core_opts) +CONF.register_cli_opts(debug_opts) global_opts = [ cfg.StrOpt('my_ip', @@ -376,4 +377,4 @@ global_opts = [ 'vmwareapi.VMWareESXDriver'), ] -FLAGS.register_opts(global_opts) +CONF.register_opts(global_opts) |