Merge remote-tracking branch 'target/master'
diff --git a/keystone/meta/salt.yml b/keystone/meta/salt.yml
index 8a929bc..699406c 100644
--- a/keystone/meta/salt.yml
+++ b/keystone/meta/salt.yml
@@ -13,7 +13,7 @@
{{ policy_grains|yaml(False)|indent(6) }}
minion:
- {%- if pillar.keystone.server is defined or pillar.keystone.client is defined %}
+ {%- if pillar.get('keystone', {}).get('server') or pillar.get('keystone', {}).get('client') %}
{%- from "keystone/map.jinja" import server with context %}
{%- from "keystone/map.jinja" import client with context %}