diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-20 02:02:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-20 02:02:50 +0000 |
| commit | 8c821c872cbec95bd48e68dc62c46030a097ce4f (patch) | |
| tree | fe38ad882ef665d78f85dce46dda716a89971f08 /nova/config.py | |
| parent | 1251c02d1d3587e7762eaab1352d08cbf5baa3c4 (diff) | |
| parent | 94d87bce212f91c54370784a5544f1a07625938a (diff) | |
| download | nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.gz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.xz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.zip | |
Merge "Remove nova.config.CONF"
Diffstat (limited to 'nova/config.py')
| -rw-r--r-- | nova/config.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nova/config.py b/nova/config.py index c991e82ea..613333724 100644 --- a/nova/config.py +++ b/nova/config.py @@ -22,8 +22,6 @@ import socket from nova.openstack.common import cfg -CONF = cfg.CONF - def _get_my_ip(): """ @@ -77,8 +75,8 @@ debug_opts = [ help='Add python stack traces to SQL as comment strings'), ] -CONF.register_cli_opts(core_opts) -CONF.register_cli_opts(debug_opts) +cfg.CONF.register_cli_opts(core_opts) +cfg.CONF.register_cli_opts(debug_opts) global_opts = [ cfg.StrOpt('my_ip', @@ -372,11 +370,11 @@ global_opts = [ 'vmwareapi.VMWareESXDriver'), ] -CONF.register_opts(global_opts) +cfg.CONF.register_opts(global_opts) def parse_args(argv, default_config_files=None): - CONF.disable_interspersed_args() - return argv[:1] + CONF(argv[1:], - project='nova', - default_config_files=default_config_files) + cfg.CONF.disable_interspersed_args() + return argv[:1] + cfg.CONF(argv[1:], + project='nova', + default_config_files=default_config_files) |