commit a6e496a4ecf80ca44a92498f406d26b3313bfbb3
author Filip Pytloun <filip@pytloun.cz> Thu Jul 27 13:24:29 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jul 27 13:24:30 2017 +0000
tree 70db4a87528631ec418ff95db61f635f2d2291e2
parent ffc2225dde7b95f9e63b73c0cb6102d0c75effc0
parent ec185e3ee81cc7b497836c6a280f85dc8b743900

Merge "Fix meta/salt when heka_alarming is not present"

heka/meta/salt.yml

diff --git a/heka/meta/salt.yml b/heka/meta/salt.yml
index f7c7af4..cfa8f38 100644
--- a/heka/meta/salt.yml
+++ b/heka/meta/salt.yml
@@ -59,9 +59,11 @@
         {%- set service_grains = salt['grains.filter_by']({'default': service_grains}, merge=heka_yaml) %}
       {%- endif %}
     {%- endfor %}
+  {%- if 'heka_alarming' in salt.keys() %}
   heka:
     heka:
       {{ salt['heka_alarming.grains_for_mine'](service_grains)|yaml(False)|indent(6) }}
+  {%- endif %}
 
 {#-
   vim: syntax=jinja