openstack
/
heat
Code Issues Proposed changes

Deprecate resources for inactive services 

Monasca, Sahara and Senlin were marked inactive during this cycle and
will not be part of the 2024.1 release. Because these projects are not
maintained in a consistent way, we deprecate resources for these
services.

We aim to remove these in the 2024.2 release.

Change-Id: Iab377ebc2569a4a5a81f736a1dfe9f406135f5d3
This commit is contained in:
Takashi Kajinami 2024-01-22 17:55:24 +09:00
parent 2df46d4c59
commit 895d8645ad
11 changed files with 85 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/engine/resources/openstack/monasca/alarm_definition.py
View File

@ -32,11 +32,15 @@ class MonascaAlarmDefinition(resource.Resource):
"""
support_status = support.SupportStatus(
version='7.0.0',
version='22.0.0',
status=support.DEPRECATED,
message=_('Monasca project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.UNSUPPORTED
))
version='7.0.0',
previous_status=support.SupportStatus(
version='5.0.0',
status=support.UNSUPPORTED
)))
default_client_name = 'monasca'

13
heat/engine/resources/openstack/monasca/notification.py
View File

@ -32,11 +32,16 @@ class MonascaNotification(resource.Resource):
"""
support_status = support.SupportStatus(
version='7.0.0',
version='22.0.0',
status=support.DEPRECATED,
message=_('Monasca project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.UNSUPPORTED
))
version='7.0.0',
status=support.SUPPORTED,
previous_status=support.SupportStatus(
version='5.0.0',
status=support.SUPPORTED
)))
default_client_name = 'monasca'

9
heat/engine/resources/openstack/sahara/cluster.py
View File

@ -49,6 +49,15 @@ class SaharaCluster(resource.Resource):
should specify a keypair.
"""
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.SUPPORTED
))
PROPERTIES = (
NAME, PLUGIN_NAME, HADOOP_VERSION, CLUSTER_TEMPLATE_ID,
KEY_NAME, IMAGE, MANAGEMENT_NETWORK, IMAGE_ID,

9
heat/engine/resources/openstack/sahara/data_source.py
View File

@ -26,7 +26,14 @@ class DataSource(resource.Resource):
or output data and any credentials needed to access the location.
"""
support_status = support.SupportStatus(version='5.0.0')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.SUPPORTED
))
PROPERTIES = (
NAME, TYPE, URL, DESCRIPTION, CREDENTIALS

9
heat/engine/resources/openstack/sahara/image.py
View File

@ -26,7 +26,14 @@ class SaharaImageRegistry(resource.Resource):
Allows to register an image in the sahara image registry and add tags.
"""
support_status = support.SupportStatus(version='6.0.0')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.SUPPORTED
))
PROPERTIES = (
IMAGE, USERNAME, DESCRIPTION, TAGS

9
heat/engine/resources/openstack/sahara/job.py
View File

@ -33,7 +33,14 @@ class SaharaJob(signal_responder.SignalResponder, resource.Resource):
job binary objects. Can be launched using resource-signal.
"""
support_status = support.SupportStatus(version='8.0.0')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='8.0.0',
status=support.SUPPORTED
))
PROPERTIES = (
NAME, TYPE, MAINS, LIBS, DESCRIPTION,

9
heat/engine/resources/openstack/sahara/job_binary.py
View File

@ -29,7 +29,14 @@ class JobBinary(resource.Resource):
credentials needed to retrieve the file.
"""
support_status = support.SupportStatus(version='5.0.0')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='5.0.0',
status=support.SUPPORTED
))
PROPERTIES = (
NAME, URL, DESCRIPTION, CREDENTIALS

9
heat/engine/resources/openstack/sahara/templates.py
View File

@ -44,7 +44,14 @@ class SaharaNodeGroupTemplate(resource.Resource):
configurations for those processes.
"""
support_status = support.SupportStatus(version='2014.2')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Sahara project was marked inactive'),
previous_status=support.SupportStatus(
version='2014.2',
status=support.SUPPORTED
))
PROPERTIES = (
NAME, PLUGIN_NAME, HADOOP_VERSION, FLAVOR, DESCRIPTION,

9
heat/engine/resources/openstack/senlin/res_base.py
View File

@ -14,6 +14,7 @@
from oslo_log import log as logging
from heat.common.i18n import _
from heat.engine import resource
from heat.engine import support
@ -23,7 +24,13 @@ LOG = logging.getLogger(__name__)
class BaseSenlinResource(resource.Resource):
"""A base class for Senlin resources."""
support_status = support.SupportStatus(version='6.0.0')
support_status = support.SupportStatus(
version='22.0.0',
status=support.DEPRECATED,
message=_('Senlin project was marked inactive'),
previous_status=support.SupportStatus(
version='6.0.0',
))
default_client_name = 'senlin'

3
heat/tests/engine/test_resource_type.py
View File

@ -42,8 +42,7 @@ class ResourceTypeTest(common.HeatTestCase):
mock_is_service_available):
mock_is_service_available.return_value = (True, None)
resources = self.eng.list_resource_types(self.ctx, "DEPRECATED")
self.assertEqual(set(['OS::Aodh::Alarm']),
set(resources))
self.assertIn('OS::Aodh::Alarm', resources)
@mock.patch.object(res.Resource, 'is_service_available')
def test_list_resource_types_supported(self,

10
releasenotes/notes/deprecate-inactive-project-rsc-caracal-ba0b0005f67580f9.yaml Normal file
View File

@ -0,0 +1,10 @@
---
deprecations:
- |
The following resources have been deprecated, because monasca, sahara and
senlin were marked inactive and will not get deliverables for the 2024.1
release. These resources will be removed in ``23.0.0`` release.
- ``OS::Monasca::*``
- ``OS::Sahara::*``
- ``OS::Senlin::*``