openstack/ironic
Code Issues Proposed changes

Merge "Deprecate ClusteredComputeManager"

Browse Source
This commit is contained in:
Jenkins
2016-09-20 14:30:03 +00:00
committed by Gerrit Code Review
parent 861268cb63 d1c47cbf72
commit ebd1f566c8
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ironic/nova/compute/manager.py
View File

@@ -23,16 +23,33 @@ work. The goal here is to generalise the areas where n-c talking to a clustered
hypervisor has issues, and long term fold them into the main ComputeManager. hypervisor has issues, and long term fold them into the main ComputeManager.
""" """
from oslo_concurrency import lockutils
from oslo_log import log as logging
from nova.compute import manager from nova.compute import manager
import nova.context import nova.context
from oslo_concurrency import lockutils from nova.i18n import _LW
LOG = logging.getLogger(__name__)
CCM_SEMAPHORE = 'clustered_compute_manager' CCM_SEMAPHORE = 'clustered_compute_manager'
# TODO(jroll) delete this in Ocata
class ClusteredComputeManager(manager.ComputeManager): class ClusteredComputeManager(manager.ComputeManager):
def __init__(self, *args, **kwargs):
LOG.warning(_LW('ClusteredComputeManager is deprecated. As of the '
'Newton release of Nova, the ironic '
'virt driver directly supports using multiple '
'compute hosts without ClusteredComputeManager. '
'Users should unset the `compute_manager` '
'configuration option to use Nova\'s default '
'instead. ClusteredComputeManager will be removed '
'during the Ocata cycle.'))
super(ClusteredComputeManager, self).__init__(*args, **kwargs)
def init_host(self): def init_host(self):
"""Initialization for a clustered compute service.""" """Initialization for a clustered compute service."""
self.driver.init_host(host=self.host) self.driver.init_host(host=self.host)

12
releasenotes/notes/deprecate-clustered-compute-manager-3dd68557446bcc5c.yaml Normal file
View File

@@ -0,0 +1,12 @@
---
deprecations:
- |
In Nova commit 6047d790a32ef5a65d4d6b029f673ce53c3d4141,
functionality is added to the ironic virt
driver to support multiple compute hosts without using the hack
we call ClusteredComputeManager.
We anticipate this being included in the Newton release of Nova.
In advance of that, we are marking this unsupported component
as deprecated, and plan to remove it before the end of the Ocata
development cycle.