From cb1d214d3ef737b36f5253615d82dc889bb4274d Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Fri, 10 Mar 2017 12:12:52 +0100
Subject: [PATCH] Fix heat-engine and heat-api-cfn workers configuration

Change-Id: I5c04712b1ae9ebe36b5c57eed05c34fec09f1fd8
Closes-Bug: #1671784
---
 ansible/roles/heat/templates/heat.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b9389e445a..006542b7a3 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -15,7 +15,10 @@ stack_user_domain_name = heat_user_domain
 
 deferred_auth_method = trusts
 trusts_delegated_roles = heat_stack_owner
+
+{% if service_name == 'heat-engine' %}
 num_engine_workers = {{ openstack_service_workers }}
+{% endif %}
 
 transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
@@ -30,6 +33,7 @@ workers = {{ openstack_service_workers }}
 [heat_api_cfn]
 bind_host = {{ api_interface_address }}
 bind_port = {{ heat_api_cfn_port }}
+workers = {{ openstack_service_workers }}
 {% endif %}
 
 [database]