Remove deprecated manager option in cells.py

The manager option in cells group is deprecated in mitaka
and hence removed in newton.

Checked cells.py for check_deprecation_status and
removed the tag according to wiki.
https://wiki.openstack.org/wiki/ConfigOptionsConsistency

Blueprint centralize-config-options-newton

Change-Id: Iebd6c261d7e5ca531dbf473f1d986b2e42f02e41
This commit is contained in:
Anusha Unnam 2016-07-27 20:42:31 +00:00
parent 11697569ea
commit 28803fa40b
4 changed files with 14 additions and 31 deletions

View File

@ -40,6 +40,6 @@ def main():
server = service.Service.create(binary='nova-cells',
topic=CONF.cells.topic,
manager=CONF.cells.manager)
manager='nova.cells.manager.CellsManager')
service.serve(server)
service.wait()

View File

@ -1,6 +1,3 @@
# needs:check_deprecation_status
# Copyright 2015 OpenStack Foundation
# All Rights Reserved.
#
@ -23,6 +20,7 @@ cells_group = cfg.OptGroup('cells',
help="""
Cells options allow you to use cells functionality in openstack
deployment.
""")
cells_opts = [
@ -46,6 +44,7 @@ Related options:
* name: A unique cell name must be given when this functionality
is enabled.
* cell_type: Cell type should be defined for all cells.
"""),
cfg.StrOpt('topic',
default='cells',
@ -60,31 +59,6 @@ Possible values:
* cells: This is the recommended and the default value.
"""),
cfg.StrOpt('manager',
default='nova.cells.manager.CellsManager',
deprecated_for_removal=True,
help="""
Manager for cells
The nova-cells manager class. This class defines RPC methods that
the local cell may call. This class is NOT used for messages coming
from other cells. That communication is driver-specific.
Communication to other cells happens via the nova.cells.messaging module.
The MessageRunner from that module will handle routing the message to
the correct cell via the communication driver. Most methods below
create 'targeted' (where we want to route a message to a specific cell)
or 'broadcast' (where we want a message to go to multiple cells)
messages.
Scheduling requests get passed to the scheduler class.
Possible values:
* 'nova.cells.manager.CellsManager' is the only possible value for
this option as of the Mitaka release
"""),
cfg.StrOpt('name',
default='nova',
@ -99,6 +73,7 @@ Related options:
* enabled: This option is meaningful only when cells service
is enabled
"""),
cfg.ListOpt('capabilities',
default=['hypervisor=xenserver;kvm', 'os=linux;windows'],
@ -291,6 +266,7 @@ Related options:
* This value is used with the ``instance_update_num_instances``
value in a periodic task run.
"""),
cfg.IntOpt("instance_update_num_instances",
default=1,
@ -311,6 +287,7 @@ Related options:
* This value is used with the ``instance_updated_at_threshold``
value in a periodic task run.
""")
]
@ -339,7 +316,6 @@ The class of the driver used by the cells scheduler. This should be
the full Python path to the class to be used. If nothing is specified
in this option, the CellsScheduler is used.
""")
]
@ -443,6 +419,7 @@ Related options:
* This value is used with the ``scheduler_retry_delay`` value
while retrying to find a suitable cell.
"""),
cfg.IntOpt('scheduler_retry_delay',
default=2,
@ -463,6 +440,7 @@ Related options:
* This value is used with the ``scheduler_retries`` value
while retrying to find a suitable cell.
""")
]

View File

@ -32,7 +32,8 @@ class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
# db_check_interval < 0 makes cells manager always hit the DB
self.flags(enable=True, db_check_interval=-1, group='cells')
super(CellsSampleJsonTest, self).setUp()
self.cells = self.start_service('cells', manager=CONF.cells.manager)
self.cells = self.start_service('cells',
manager='nova.cells.manager.CellsManager')
self._stub_cells()
def _stub_cells(self, num_cells=5):

View File

@ -0,0 +1,4 @@
---
upgrade:
- The 'manager' option in [cells] group was deprecated in Mitaka and
now it is removed completely in newton. There is no impact.