Add ability to configure notification workers
Change-Id: I38e9c8a337f963dd3519fe2fc1c8e882405c8bb1
Related-Prod: https://mirantis.jira.com/browse/PROD-23449
diff --git a/README.rst b/README.rst
index 3855b53..0ca4467 100644
--- a/README.rst
+++ b/README.rst
@@ -42,6 +42,13 @@
user: openstack
password: pwd
virtual_host: '/openstack'
+ notification:
+ workers: 8
+ batch_timeout: 10
+ batch_size: 100
+ policy:
+ segregation: 'rule:context_is_admin'
+ 'telemetry:get_resource':
Enable CORS parameters
------------------------------
diff --git a/ceilometer/files/pike/ceilometer-server.conf.Debian b/ceilometer/files/pike/ceilometer-server.conf.Debian
index 559ef0d..34d3284 100644
--- a/ceilometer/files/pike/ceilometer-server.conf.Debian
+++ b/ceilometer/files/pike/ceilometer-server.conf.Debian
@@ -93,6 +93,10 @@
batch_timeout = {{ server.notification.batch_timeout }}
{%- endif %}
+{%- if server.get('notification', {}).workers is defined %}
+workers = {{ server.notification.workers }}
+{%- endif %}
+
[database]
{%- if server.get('database', False) %}
diff --git a/ceilometer/files/queens/ceilometer-server.conf.Debian b/ceilometer/files/queens/ceilometer-server.conf.Debian
index 67448e4..8b6e033 100644
--- a/ceilometer/files/queens/ceilometer-server.conf.Debian
+++ b/ceilometer/files/queens/ceilometer-server.conf.Debian
@@ -265,6 +265,9 @@
# Minimum value: 1
# Deprecated group/name - [DEFAULT]/notification_workers
#workers = 1
+{%- if server.get('notification', {}).workers is defined %}
+workers = {{ server.notification.workers }}
+{%- endif %}
# Select which pipeline managers to enable to generate data (multi valued)
#pipelines = meter
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 6aec6f1..be5f1bb 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -60,6 +60,7 @@
host: 127.0.0.4
port: 8086
notification:
+ workers: 8
batch_timeout: 10
batch_size: 100
policy: