Merge "conf: remove deprecated cert_topic option"

nova/cert/manager.py

@@ -16,7 +16,6 @@ Cert manager manages x509 certificates.
 
 **Related Flags**
 
-:cert_topic:  What :mod:`rpc` topic to listen to (default: `cert`).
 :cert_manager:  The module name of a class derived from
                 :class:`manager.Manager` (default:
                 :class:`nova.cert.manager.Manager`).

nova/cert/rpcapi.py

@@ -58,7 +58,7 @@ class CertAPI(object):
 
     def __init__(self):
         super(CertAPI, self).__init__()
-        target = messaging.Target(topic=CONF.cert_topic, version='2.0')
+        target = messaging.Target(topic='cert', version='2.0')
         version_cap = self.VERSION_ALIASES.get(CONF.upgrade_levels.cert,
                                                CONF.upgrade_levels.cert)
         self.client = rpc.get_client(target, version_cap=version_cap)

nova/cmd/cert.py

@@ -44,6 +44,6 @@ def main():
 
     gmr.TextGuruMeditation.setup_autorun(version)
 
-    server = service.Service.create(binary='nova-cert', topic=CONF.cert_topic)
+    server = service.Service.create(binary='nova-cert')
     service.serve(server)
     service.wait()

nova/conf/__init__.py

@@ -24,7 +24,6 @@ from nova.conf import availability_zone
 from nova.conf import base
 from nova.conf import cache
 from nova.conf import cells
-from nova.conf import cert
 from nova.conf import cinder
 from nova.conf import cloudpipe
 from nova.conf import compute
@@ -81,7 +80,6 @@ availability_zone.register_opts(CONF)
 base.register_opts(CONF)
 cache.register_opts(CONF)
 cells.register_opts(CONF)
-cert.register_opts(CONF)
 cinder.register_opts(CONF)
 cloudpipe.register_opts(CONF)
 compute.register_opts(CONF)

nova/conf/cert.py

@@ -1,41 +0,0 @@
-# Copyright 2016 IBM Corp.
-# Copyright 2016 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_config import cfg
-
-cert_opts = [
-    cfg.StrOpt("cert_topic",
-        deprecated_for_removal=True,
-        deprecated_since="14.0.0",
-        deprecated_reason="""
-Since the nova-cert service is marked for deprecation, the feature to change
-RPC topic that cert nodes listen may be removed as early as the 15.0.0
-Ocata release.
-""",
-        default="cert",
-        help="""
-Determines the RPC topic that the cert nodes listen on. For most deployments
-there is no need to ever change it.
-"""),
-]
-
-
-def register_opts(conf):
-    conf.register_opts(cert_opts)
-
-
-def list_opts():
-    return {"DEFAULT": cert_opts}

nova/tests/unit/cert/test_rpcapi.py

@@ -32,7 +32,6 @@ class CertRpcAPITestCase(test.NoDBTestCase):
 
         rpcapi = cert_rpcapi.CertAPI()
         self.assertIsNotNone(rpcapi.client)
-        self.assertEqual(CONF.cert_topic, rpcapi.client.target.topic)
 
         orig_prepare = rpcapi.client.prepare
 

releasenotes/notes/remove_deprecated_cert_topic_conf_opt-6402aeca8629da95.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``cert_topic`` has been removed from the ``DEFAULT`` section. It was marked
+    as deprecated due to planned removal of nova-cert service.