diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 07:02:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 07:02:38 +0000 |
| commit | aa46eb0a70cfc138132ceed13ac57874249deeb0 (patch) | |
| tree | aeedee294872b3ec59b5dd8f6597af19141ba6f0 | |
| parent | f9029d36e8a70d85ee31eed673c625b5199030c2 (diff) | |
| parent | 9714f31f37e48e9c6f0fca3b3b6e8cd047769b09 (diff) | |
| download | nova-aa46eb0a70cfc138132ceed13ac57874249deeb0.tar.gz nova-aa46eb0a70cfc138132ceed13ac57874249deeb0.tar.xz nova-aa46eb0a70cfc138132ceed13ac57874249deeb0.zip | |
Merge "Move cert_topic into nova.cert.rpcapi"
| -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 e197757a7..4e6812b7a 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): |