Remove cells topic configuration option

This has been deprecated since 15.0.0. It will now continue to use the
default value 'cells'.

Change-Id: Ic2922f0a64f8a099778d3f6934143080d4ea1ccd
This commit is contained in:
Mike Perez 2017-05-07 22:20:23 -04:00 committed by Sean Dague
parent 0fc64f0ab6
commit 7815108d48
6 changed files with 13 additions and 23 deletions

View File

@ -15,3 +15,5 @@
""" """
Cells Cells
""" """
TOPIC = 'cells'

View File

@ -27,6 +27,7 @@ from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from nova import cells
import nova.conf import nova.conf
from nova import exception from nova import exception
from nova import objects from nova import objects
@ -135,7 +136,7 @@ class CellsAPI(object):
def __init__(self): def __init__(self):
super(CellsAPI, self).__init__() super(CellsAPI, self).__init__()
target = messaging.Target(topic=CONF.cells.topic, version='1.0') target = messaging.Target(topic=cells.TOPIC, version='1.0')
version_cap = self.VERSION_ALIASES.get(CONF.upgrade_levels.cells, version_cap = self.VERSION_ALIASES.get(CONF.upgrade_levels.cells,
CONF.upgrade_levels.cells) CONF.upgrade_levels.cells)
# NOTE(sbauza): Yes, this is ugly but cells_utils is calling cells.db # NOTE(sbauza): Yes, this is ugly but cells_utils is calling cells.db

View File

@ -20,6 +20,7 @@ import sys
from oslo_log import log as logging from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr from oslo_reports import guru_meditation_report as gmr
from nova import cells
import nova.conf import nova.conf
from nova import config from nova import config
from nova import objects from nova import objects
@ -39,7 +40,7 @@ def main():
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-cells', server = service.Service.create(binary='nova-cells',
topic=CONF.cells.topic, topic=cells.TOPIC,
manager='nova.cells.manager.CellsManager') manager='nova.cells.manager.CellsManager')
service.serve(server) service.serve(server)
service.wait() service.wait()

View File

@ -29,25 +29,6 @@ required and all Nova deployments will be at least a cells v2 cell of one.
""") """)
cells_opts = [ cells_opts = [
cfg.StrOpt('topic',
default='cells',
deprecated_for_removal=True,
deprecated_since='15.0.0',
deprecated_reason="""
Configurable RPC topics provide little value and can result in a wide variety
of errors. They should not be used.
""",
help="""
Topic.
This is the message queue topic that cells nodes listen on. It is
used when the cells service is started up to configure the queue,
and whenever an RPC call to the scheduler is made.
Possible values:
* cells: This is the recommended and the default value.
"""),
cfg.BoolOpt('enable', cfg.BoolOpt('enable',
default=False, default=False,
help=""" help="""

View File

@ -34,9 +34,9 @@ class CellsAPITestCase(test.NoDBTestCase):
def setUp(self): def setUp(self):
super(CellsAPITestCase, self).setUp() super(CellsAPITestCase, self).setUp()
self.fake_topic = 'fake_topic' self.fake_topic = 'cells'
self.fake_context = 'fake_context' self.fake_context = 'fake_context'
self.flags(topic=self.fake_topic, enable=True, group='cells') self.flags(enable=True, group='cells')
self.cells_rpcapi = cells_rpcapi.CellsAPI() self.cells_rpcapi = cells_rpcapi.CellsAPI()
def _stub_rpc_method(self, rpc_method, result): def _stub_rpc_method(self, rpc_method, result):

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The cells topic configuration option has been removed. Please make sure
your cells related message queue topic is 'cells'.