From c9af93ce614752a6702550031f519312f965b6a6 Mon Sep 17 00:00:00 2001
From: Oleksii Grudev <ogrudev@mirantis.com>
Date: Thu, 19 Jul 2018 12:41:02 +0300
Subject: [PATCH] Grafana prevent yaml from failing

When including /meta/salt.yml from outside of this
formula the yaml can fail if appropriate pillar elements are not
found. Changing syntax to eliminate this. Including the file
above is needed for generating minion orchestration config
for future use with salt orchestration methods

Change-Id: Ia3fb7eee7c6298d294f641232c8c7e8f8b5806af
Related-PROD: PROD-19973
---
 grafana/meta/salt.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grafana/meta/salt.yml b/grafana/meta/salt.yml
index 50c001f..3c00ab7 100644
--- a/grafana/meta/salt.yml
+++ b/grafana/meta/salt.yml
@@ -17,7 +17,7 @@ grain:
 {%- endif %}
 
 minion:
-  {%- if pillar.grafana.client is defined %}
+  {%- if pillar.get('grafana', {}).client is defined %}
   grafana:
     {%- from "grafana/map.jinja" import client with context %}
     grafana_version: {{ client.server.get('version', 3) }}