Remove sahara support

The sahara project has been retired because of inactivity[1].

[1] https://review.opendev.org/c/openstack/governance/+/919374

Change-Id: Icd57662a55ca8f0e4ee28aee7eae7f06e498ae9e
This commit is contained in:
Takashi Kajinami 2024-08-23 17:10:23 +09:00
parent 2be0471248
commit 8036d4913e
4 changed files with 11 additions and 29 deletions

View File

@ -68,7 +68,7 @@ OPTS = [
EXCHANGES_OPTS = [ EXCHANGES_OPTS = [
cfg.MultiStrOpt('notification_control_exchanges', cfg.MultiStrOpt('notification_control_exchanges',
default=['nova', 'glance', 'neutron', 'cinder', 'heat', default=['nova', 'glance', 'neutron', 'cinder', 'heat',
'keystone', 'sahara', 'trove', 'zaqar', 'swift', 'keystone', 'trove', 'zaqar', 'swift',
'ceilometer', 'magnum', 'dns', 'ironic', 'aodh'], 'ceilometer', 'magnum', 'dns', 'ironic', 'aodh'],
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
deprecated_name="http_control_exchanges", deprecated_name="http_control_exchanges",

View File

@ -202,33 +202,6 @@
fields: payload.stack_identity fields: payload.stack_identity
name: name:
fields: payload.name fields: payload.name
- event_type: sahara.cluster.*
traits: &sahara_crud
project_id:
fields: payload.project_id
user_id:
fields: ctxt.user_id
resource_id:
fields: payload.cluster_id
name:
fields: payload.name
- event_type: sahara.cluster.health
traits: &sahara_health
<<: *sahara_crud
verification_id:
fields: payload.verification_id
health_check_status:
fields: payload.health_check_status
health_check_name:
fields: payload.health_check_name
health_check_description:
fields: payload.health_check_description
created_at:
type: datetime
fields: payload.created_at
updated_at:
type: datetime
fields: payload.updated_at
- event_type: ['identity.user.*', 'identity.project.*', 'identity.group.*', 'identity.role.*', 'identity.OS-TRUST:trust.*', - event_type: ['identity.user.*', 'identity.project.*', 'identity.group.*', 'identity.role.*', 'identity.OS-TRUST:trust.*',
'identity.region.*', 'identity.service.*', 'identity.endpoint.*', 'identity.policy.*'] 'identity.region.*', 'identity.service.*', 'identity.endpoint.*', 'identity.policy.*']
traits: &identity_crud traits: &identity_crud

View File

@ -93,7 +93,7 @@ class TestNotification(BaseNotificationTest):
self.srv = notification.NotificationService(0, self.CONF) self.srv = notification.NotificationService(0, self.CONF)
def test_targets(self): def test_targets(self):
self.assertEqual(15, len(self.srv.get_targets())) self.assertEqual(14, len(self.srv.get_targets()))
def test_start_multiple_listeners(self): def test_start_multiple_listeners(self):
urls = ["fake://vhost1", "fake://vhost2"] urls = ["fake://vhost1", "fake://vhost2"]

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
Default value of the ``[notification] notification_control_exchanges``
option has been updated and ``sahara`` is no longer included by default.
- |
The default event definiton has been updated and no longer includes
events for sahara.