From 0f89dea1f13c795d6332b9a69a32ce04d5b2b503 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jan 04 2017 17:44:14 +0000
Subject: properly get grains from pillars


---

diff --git a/pillar/top.sls b/pillar/top.sls
index b36f382..443ced7 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,10 +1,10 @@
-{% set country = salt['pillar.get']('country') %}
+{% set country = salt['pillar.get']('grains:country') %}
 {% set domain = salt['grains.get']('domain') %}
 {% set id = salt['grains.get']('id') %}
 {% set osrelease = salt['grains.get']('osrelease') %}
-{% set roles = salt['pillar.get']('roles', []) %}
-{% set salt_cluster = salt['pillar.get']('salt_cluster', '') %}
-{% set virt_cluster = salt['pillar.get']('virt_cluster', '') %}
+{% set roles = salt['pillar.get']('grains:roles', []) %}
+{% set salt_cluster = salt['pillar.get']('grains:salt_cluster', '') %}
+{% set virt_cluster = salt['pillar.get']('grains:virt_cluster', '') %}
 {% set virtual = salt['grains.get']('virtual') %}
 
 production: