diff --git a/heat/engine/resources/openstack/monasca/alarm_definition.py b/heat/engine/resources/openstack/monasca/alarm_definition.py index 3af1fa2be7..dea669eaef 100644 --- a/heat/engine/resources/openstack/monasca/alarm_definition.py +++ b/heat/engine/resources/openstack/monasca/alarm_definition.py @@ -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' diff --git a/heat/engine/resources/openstack/monasca/notification.py b/heat/engine/resources/openstack/monasca/notification.py index 8074bd0b03..65a155da58 100644 --- a/heat/engine/resources/openstack/monasca/notification.py +++ b/heat/engine/resources/openstack/monasca/notification.py @@ -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' diff --git a/heat/engine/resources/openstack/sahara/cluster.py b/heat/engine/resources/openstack/sahara/cluster.py index 05a0def884..6dc45a6bda 100644 --- a/heat/engine/resources/openstack/sahara/cluster.py +++ b/heat/engine/resources/openstack/sahara/cluster.py @@ -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, diff --git a/heat/engine/resources/openstack/sahara/data_source.py b/heat/engine/resources/openstack/sahara/data_source.py index ff41bf439a..c793f89b4a 100644 --- a/heat/engine/resources/openstack/sahara/data_source.py +++ b/heat/engine/resources/openstack/sahara/data_source.py @@ -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 diff --git a/heat/engine/resources/openstack/sahara/image.py b/heat/engine/resources/openstack/sahara/image.py index dc60c72b39..152fbb1b4e 100644 --- a/heat/engine/resources/openstack/sahara/image.py +++ b/heat/engine/resources/openstack/sahara/image.py @@ -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 diff --git a/heat/engine/resources/openstack/sahara/job.py b/heat/engine/resources/openstack/sahara/job.py index cda967946b..63ca204d67 100644 --- a/heat/engine/resources/openstack/sahara/job.py +++ b/heat/engine/resources/openstack/sahara/job.py @@ -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, diff --git a/heat/engine/resources/openstack/sahara/job_binary.py b/heat/engine/resources/openstack/sahara/job_binary.py index 85cf705f2c..f1e05af5c3 100644 --- a/heat/engine/resources/openstack/sahara/job_binary.py +++ b/heat/engine/resources/openstack/sahara/job_binary.py @@ -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 diff --git a/heat/engine/resources/openstack/sahara/templates.py b/heat/engine/resources/openstack/sahara/templates.py index 0f52a2a449..c49ee01007 100644 --- a/heat/engine/resources/openstack/sahara/templates.py +++ b/heat/engine/resources/openstack/sahara/templates.py @@ -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, diff --git a/heat/engine/resources/openstack/senlin/res_base.py b/heat/engine/resources/openstack/senlin/res_base.py index a294df1fb2..3df3fd6043 100644 --- a/heat/engine/resources/openstack/senlin/res_base.py +++ b/heat/engine/resources/openstack/senlin/res_base.py @@ -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' diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py index eab8ea8fa5..ff23e70a18 100644 --- a/heat/tests/engine/test_resource_type.py +++ b/heat/tests/engine/test_resource_type.py @@ -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, diff --git a/releasenotes/notes/deprecate-inactive-project-rsc-caracal-ba0b0005f67580f9.yaml b/releasenotes/notes/deprecate-inactive-project-rsc-caracal-ba0b0005f67580f9.yaml new file mode 100644 index 0000000000..edfa9487ce --- /dev/null +++ b/releasenotes/notes/deprecate-inactive-project-rsc-caracal-ba0b0005f67580f9.yaml @@ -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::*``