diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 06:44:36 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 10:23:40 +0000 |
| commit | 9714f31f37e48e9c6f0fca3b3b6e8cd047769b09 (patch) | |
| tree | bf35c4917e2c63f6e263cbdcc8b71d414855a435 | |
| parent | 0778420dcd94b935d7c6dd075e49041e497cf462 (diff) | |
| download | nova-9714f31f37e48e9c6f0fca3b3b6e8cd047769b09.tar.gz nova-9714f31f37e48e9c6f0fca3b3b6e8cd047769b09.tar.xz nova-9714f31f37e48e9c6f0fca3b3b6e8cd047769b09.zip | |
Move cert_topic into nova.cert.rpcapi
The cert_topic opt is only used in nova.cert.rpcapi and it makes sense
for the RPC module to "own" the topic option.
blueprint: scope-config-opts
Change-Id: If3584b8e1984e0425d9f33133f9d291739b04d49
| -rwxr-xr-x | bin/nova-cert | 2 | ||||
| -rw-r--r-- | nova/cert/rpcapi.py | 8 | ||||
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/tests/cert/test_rpcapi.py | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/bin/nova-cert b/bin/nova-cert index 8488d09ea..113b06510 100755 --- a/bin/nova-cert +++ b/bin/nova-cert @@ -39,7 +39,7 @@ from nova import service from nova import utils CONF = cfg.CONF -CONF.import_opt('cert_topic', 'nova.config') +CONF.import_opt('cert_topic', 'nova.cert.rpcapi') if __name__ == '__main__': config.parse_args(sys.argv) diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index 79b136571..fdaa327cb 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -21,8 +21,14 @@ Client side of the cert manager RPC API. from nova.openstack.common import cfg import nova.openstack.common.rpc.proxy +rpcapi_opts = [ + cfg.StrOpt('cert_topic', + default='cert', + help='the topic cert nodes listen on'), +] + CONF = cfg.CONF -CONF.import_opt('cert_topic', 'nova.config') +CONF.register_opts(rpcapi_opts) class CertAPI(nova.openstack.common.rpc.proxy.RpcProxy): diff --git a/nova/config.py b/nova/config.py index 6b0ea60d6..d6f63d602 100644 --- a/nova/config.py +++ b/nova/config.py @@ -47,9 +47,6 @@ global_opts = [ cfg.StrOpt('my_ip', default=_get_my_ip(), help='ip address of this host'), - cfg.StrOpt('cert_topic', - default='cert', - help='the topic cert nodes listen on'), cfg.StrOpt('compute_topic', default='compute', help='the topic compute nodes listen on'), diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py index f61d42408..dce325354 100644 --- a/nova/tests/cert/test_rpcapi.py +++ b/nova/tests/cert/test_rpcapi.py @@ -25,7 +25,6 @@ from nova.openstack.common import rpc from nova import test CONF = cfg.CONF -CONF.import_opt('cert_topic', 'nova.config') class CertRpcAPITestCase(test.TestCase): |