commit acb814f116ac5b83a705d522c77e9f0ce751aeff
author Jan Cach <jcach@mirantis.com> Mon May 07 18:41:28 2018 +0000
committer Gerrit Code Review <gerrit2@1f6678a0cecc> Mon May 07 18:41:28 2018 +0000
tree 6bf9efc253da96015bfda9fffc09bd5feb107f59
parent 48c9c87e3bfa6117f057e879223bfc72762314d8
parent 1ed15e30b1c6feb8813ea4d7315d5fd8ccf54c1d

Merge "Fix irond monitoring"

opencontrail/meta/heka.yml

diff --git a/opencontrail/meta/heka.yml b/opencontrail/meta/heka.yml
index 0667088..08f1937 100644
--- a/opencontrail/meta/heka.yml
+++ b/opencontrail/meta/heka.yml
@@ -22,7 +22,7 @@
         'contrail-svc-monitor',
         ) %}
     {%- if config.get('ifmap', {}).get('engine', 'irond') == 'irond' %}
-    {%- set control_processes += ('contrail-ifmap-server', 'contrail-irond',) %}
+      {%- set control_processes = control_processes + ('contrail-ifmap-server', 'contrail-irond',) %}
     {%- endif %}
   {%- endif %}
   {%- if database.get('enabled', False) %}

opencontrail/meta/prometheus.yml

diff --git a/opencontrail/meta/prometheus.yml b/opencontrail/meta/prometheus.yml
index f0405f6..72a87d0 100644
--- a/opencontrail/meta/prometheus.yml
+++ b/opencontrail/meta/prometheus.yml
@@ -49,7 +49,7 @@
     ) %}
 
     {%- if config.get('ifmap', {}).get('engine', 'irond') == 'irond' %}
-    {%- set control_processes += ('contrail-ifmap-server', 'contrail-irond',) %}
+      {%- set control_processes = control_processes + ('contrail-ifmap-server', 'contrail-irond',) %}
     {%- endif %}
 
     {%- for api in control_apis %}