From 1ab0c16ba37cf15fab5e01e9c97ecd46855a7ac4 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Tue, 4 Apr 2017 13:08:40 +0100
Subject: [PATCH] Fix senlin workers and events

Remove deprecation warning about service_token_roles_required
Set number of engine workers to avoid too many resources consuming.
Senlin can poll events from ceilometer when is enabled.

Closes-Bug: #1679697
Change-Id: I8b13d1f492344ca0b65020eb56f0e016c6bb6369
---
 ansible/roles/senlin/templates/senlin.conf.j2 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2
index 215c4b25ac..5d56dafdbf 100644
--- a/ansible/roles/senlin/templates/senlin.conf.j2
+++ b/ansible/roles/senlin/templates/senlin.conf.j2
@@ -3,6 +3,10 @@ debug = {{ senlin_logging_debug }}
 
 log_dir = /var/log/kolla/senlin
 
+{% if service_name == 'senlin-engine' %}
+num_engine_workers = {{ openstack_service_workers }}
+{% endif %}
+
 transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 {% if service_name == 'senlin-api' %}
@@ -33,10 +37,16 @@ user_domain_id = default
 project_name = service
 username = {{ senlin_keystone_user }}
 password = {{ senlin_keystone_password }}
+service_token_roles_required = False
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}
 memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 [oslo_messaging_notifications]
+{% if enable_ceilometer | bool %}
+driver = messagingv2
+topics = 'notifications'
+{% else %}
 driver = noop
+{% endif %}