diff options
author | Balazs Gibizer <balazs.gibizer@ericsson.com> | 2016-02-18 17:35:01 +0100 |
---|---|---|
committer | Balazs Gibizer <balazs.gibizer@ericsson.com> | 2016-04-04 13:44:02 +0200 |
commit | f8506618356816c3a01dff5dd99ba7c8a48f483c (patch) | |
tree | 038747e2fc748dd79a5e3f8481d36e3c1b8e3864 /nova/rpc.py | |
parent | 918a3a7925869db4e1fb7a8519a0db6f69be0f59 (diff) | |
download | nova-f8506618356816c3a01dff5dd99ba7c8a48f483c.tar.gz |
config options: Centralize 'nova.rpc' options
The single option in nova.rpc is moved to the central place.
As this module contains a single option this patch also enhances
the help text of it.
Implements: bp centralize-config-options-newton
Closes-bug: #1565753
Change-Id: Ib6030c67b315a3b8d0d4854b4b6f1b969be6c00c
Diffstat (limited to 'nova/rpc.py')
-rw-r--r-- | nova/rpc.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/nova/rpc.py b/nova/rpc.py index 0b1c554b56..5bad294d7a 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -29,25 +29,16 @@ __all__ = [ import functools from nova.i18n import _ -from oslo_config import cfg from oslo_log import log as logging import oslo_messaging as messaging from oslo_serialization import jsonutils +import nova.conf import nova.context import nova.exception -CONF = cfg.CONF -notification_opts = [ - cfg.StrOpt('notification_format', - choices=['unversioned', 'versioned', 'both'], - default='both', - help='Specifies which notification format shall be used by ' - 'nova.'), -] - -CONF.register_opts(notification_opts) +CONF = nova.conf.CONF LOG = logging.getLogger(__name__) |