From 649decbaadb1064448ae0a6d25be30fab2451bb4 Mon Sep 17 00:00:00 2001 From: Sylvain Bauza Date: Thu, 5 Nov 2015 16:15:14 +0100 Subject: [PATCH] Deprecate Extensible Resource Tracker We agreed at the Summit to remove the ERT. Before doing that, we need to advertise the entrypoint consumers that they need to consider an alternative. Release Notes should announce that too. Co-Authored-By: Paul Murray UpgradeImpact Change-Id: Ie4b6670a828d99aebfd348bd700f9f58b3e39fdb --- nova/compute/resource_tracker.py | 10 +++++++++- nova/compute/resources/__init__.py | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 524fa5d89b..71fcc8856a 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -51,7 +51,15 @@ resource_tracker_opts = [ help='Class that will manage stats for the local compute host'), cfg.ListOpt('compute_resources', default=[], - help='The names of the extra resources to track.'), + help='DEPRECATED: The names of the extra resources to track. ' + 'The Extensible Resource Tracker is deprecated and will ' + 'be removed in the 14.0.0 release. If you ' + 'use this functionality and have custom resources that ' + 'are managed by the Extensible Resource Tracker, please ' + 'contact the Nova development team by posting to the ' + 'openstack-dev mailing list. There is no future planned ' + 'support for the tracking of custom resources.', + deprecated_for_removal=True), ] allocation_ratio_opts = [ diff --git a/nova/compute/resources/__init__.py b/nova/compute/resources/__init__.py index 5641ffbef4..83101d2506 100644 --- a/nova/compute/resources/__init__.py +++ b/nova/compute/resources/__init__.py @@ -53,6 +53,15 @@ class ResourceHandler(object): names=names, propagate_map_exceptions=propagate_map_exceptions, invoke_on_load=True) + if self._mgr.names(): + LOG.warning(_LW( + 'The Extensible Resource Tracker is deprecated and will ' + 'be removed in the 14.0.0 release. If you ' + 'use this functionality and have custom resources that ' + 'are managed by the Extensible Resource Tracker, please ' + 'contact the Nova development team by posting to the ' + 'openstack-dev mailing list. There is no future planned ' + 'support for the tracking of custom resources.')) self._log_missing_plugins(names) def reset_resources(self, resources, driver):