From b89de21d47dc9114d20456452cd867041bcd83c5 Mon Sep 17 00:00:00 2001 From: Dmitrii Shcherbakov Date: Fri, 17 Nov 2017 15:13:22 +0300 Subject: [PATCH] drop driver and topic settings in designate ctx A similar change will land in designate to drop this extra topic as well. Also, driver and topic overrides in a service-specific context are not a good idea. Change-Id: I804a34fb044090010ecfd2560594cc1f55e9bd21 Closes-Bug: #1710831 Closes-Bug: #1738100 --- hooks/nova_compute_context.py | 2 -- unit_tests/test_nova_compute_contexts.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/hooks/nova_compute_context.py b/hooks/nova_compute_context.py index f5684124..05b2cfd9 100644 --- a/hooks/nova_compute_context.py +++ b/hooks/nova_compute_context.py @@ -598,8 +598,6 @@ class DesignateContext(context.OSContextGenerator): if related_units(rid): ctxt['enable_designate'] = True if ctxt['enable_designate']: - ctxt['notification_driver'] = 'messaging' - ctxt['notification_topics'] = 'notifications_designate' ctxt['notify_on_state_change'] = 'vm_and_task_state' return ctxt diff --git a/unit_tests/test_nova_compute_contexts.py b/unit_tests/test_nova_compute_contexts.py index 8be6828c..57ff5b4b 100644 --- a/unit_tests/test_nova_compute_contexts.py +++ b/unit_tests/test_nova_compute_contexts.py @@ -517,8 +517,6 @@ class DesignateContextTests(CharmTestCase): self.related_units.return_value = 'designate/0' self.assertEqual(designatectxt(), { 'enable_designate': True, - 'notification_driver': 'messaging', - 'notification_topics': 'notifications_designate', 'notify_on_state_change': 'vm_and_task_state', })