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

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)

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):

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'),

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):