diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-07 05:41:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-07 05:41:57 +0000 |
| commit | ee3d2a190844b7b0493545c6e6967cfdf520a67d (patch) | |
| tree | 5ada6a336288e02f6d70495128cad7434e943976 /nova/flags.py | |
| parent | d4dd0842b63ff3bbe0f51f3e222c0d852df79f9c (diff) | |
| parent | 637e805634b5179ffacad57ee26d4175449537f5 (diff) | |
| download | nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.gz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.xz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.zip | |
Merge "Switch from FLAGS to CONF in misc modules"
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) |