From 628ac86f48354c1c6cb83fc6341661d7192f3228 Mon Sep 17 00:00:00 2001 From: gordon chung Date: Thu, 14 Jan 2016 15:31:24 -0500 Subject: [PATCH] enable notification agent partitioning we should just enable this so we can at least catch major major breakage. Change-Id: Ib49257ac45c9baef997e24f5ae3327f951b97e2b --- ceilometer/tests/functional/test_notification.py | 3 +++ devstack/plugin.sh | 2 ++ devstack/settings | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ceilometer/tests/functional/test_notification.py b/ceilometer/tests/functional/test_notification.py index 03382d9354..7e1f87b51e 100644 --- a/ceilometer/tests/functional/test_notification.py +++ b/ceilometer/tests/functional/test_notification.py @@ -92,6 +92,7 @@ class TestNotification(tests_base.BaseTestCase): super(TestNotification, self).setUp() self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.set_override("connection", "log://", group='database') + self.CONF.set_override("backend_url", None, group="coordination") self.CONF.set_override("store_events", False, group="notification") self.CONF.set_override("disable_non_metric_meters", False, group="notification") @@ -227,6 +228,7 @@ class BaseRealNotification(tests_base.BaseTestCase): self.expected_samples = 2 + self.CONF.set_override("backend_url", None, group="coordination") self.CONF.set_override("store_events", True, group="notification") self.CONF.set_override("disable_non_metric_meters", False, group="notification") @@ -479,6 +481,7 @@ class TestRealNotificationMultipleAgents(tests_base.BaseTestCase): pipeline_cfg_file = self.setup_pipeline(['instance', 'memory']) self.CONF.set_override("pipeline_cfg_file", pipeline_cfg_file) + self.CONF.set_override("backend_url", None, group="coordination") self.CONF.set_override("store_events", False, group="notification") self.CONF.set_override("disable_non_metric_meters", False, group="notification") diff --git a/devstack/plugin.sh b/devstack/plugin.sh index eff0ab2b8e..368ed6caea 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -284,6 +284,8 @@ function configure_ceilometer { if [[ -n "$CEILOMETER_COORDINATION_URL" ]]; then iniset $CEILOMETER_CONF coordination backend_url $CEILOMETER_COORDINATION_URL iniset $CEILOMETER_CONF compute workload_partitioning True + iniset $CEILOMETER_CONF notification workload_partitioning True + iniset $CEILOMETER_CONF notification workers $API_WORKERS fi if [[ -n "$CEILOMETER_CACHE_BACKEND" ]]; then diff --git a/devstack/settings b/devstack/settings index c32f732c35..f300d5dd9d 100644 --- a/devstack/settings +++ b/devstack/settings @@ -32,7 +32,7 @@ CEILOMETER_USE_MOD_WSGI=${CEILOMETER_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVI CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications} CEILOMETER_EVENTS=${CEILOMETER_EVENTS:-True} -CEILOMETER_COORDINATION_URL=${CEILOMETER_COORDINATION_URL:-} +CEILOMETER_COORDINATION_URL=${CEILOMETER_COORDINATION_URL:-redis://localhost:6379} CEILOMETER_PIPELINE_INTERVAL=${CEILOMETER_PIPELINE_INTERVAL:-} # Cache Options