diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 07:02:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 07:02:52 +0000 |
| commit | d7b7f10855164ee0ea9cdeca21fac446ccb30b3a (patch) | |
| tree | d44fb7171dcd04a0395a704a3918ff6ea65bf619 /nova | |
| parent | aa46eb0a70cfc138132ceed13ac57874249deeb0 (diff) | |
| parent | 580df542609eae01358d14f84bbeb278e8f86eac (diff) | |
| download | nova-d7b7f10855164ee0ea9cdeca21fac446ccb30b3a.tar.gz nova-d7b7f10855164ee0ea9cdeca21fac446ccb30b3a.tar.xz nova-d7b7f10855164ee0ea9cdeca21fac446ccb30b3a.zip | |
Merge "Move network_topic into nova.network.rpcapi"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/network/rpcapi.py | 8 | ||||
| -rw-r--r-- | nova/tests/network/test_rpcapi.py | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nova/config.py b/nova/config.py index 4e6812b7a..67b5483c3 100644 --- a/nova/config.py +++ b/nova/config.py @@ -56,9 +56,6 @@ global_opts = [ cfg.StrOpt('scheduler_topic', default='scheduler', help='the topic scheduler nodes listen on'), - cfg.StrOpt('network_topic', - default='network', - help='the topic network nodes listen on'), cfg.ListOpt('enabled_apis', default=['ec2', 'osapi_compute', 'metadata'], help='a list of APIs to enable by default'), diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index 4f8ebeb22..2f52add57 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -23,8 +23,14 @@ from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova.openstack.common.rpc import proxy as rpc_proxy +rpcapi_opts = [ + cfg.StrOpt('network_topic', + default='network', + help='the topic network nodes listen on'), +] + CONF = cfg.CONF -CONF.import_opt('network_topic', 'nova.config') +CONF.register_opts(rpcapi_opts) class NetworkAPI(rpc_proxy.RpcProxy): diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py index 032996209..90bffeeaf 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/network/test_rpcapi.py @@ -25,7 +25,6 @@ from nova.openstack.common import rpc from nova import test CONF = cfg.CONF -CONF.import_opt('network_topic', 'nova.config') class NetworkRpcAPITestCase(test.TestCase): |