diff --git a/keystone/client/server.sls b/keystone/client/server.sls
index c7c137f..7fafc04 100644
--- a/keystone/client/server.sls
+++ b/keystone/client/server.sls
@@ -26,6 +26,8 @@
                            'password': server.admin.password} %}
 {%- endif %}
 
+{%- if server.roles is defined %}
+
 keystone_{{ server_name }}_roles:
   keystone.role_present:
   - names: {{ server.roles }}
@@ -39,6 +41,8 @@
   - connection_auth_url: {{ connection_args.auth_url }}
   {%- endif %}
 
+{%- endif %}
+
 {% for service_name, service in server.get('service', {}).iteritems() %}
 
 keystone_{{ server_name }}_service_{{ service_name }}:
diff --git a/keystone/server.sls b/keystone/server.sls
index 5d1cfc6..5055d96 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -197,6 +197,9 @@
 {% endif %}
 
 {%- if not grains.get('noservices', False) %}
+
+{%- if not salt['pillar.get']('linux:system:repo:mirantis_openstack', False) %}
+
 keystone_service_tenant:
   keystone.tenant_present:
   - name: {{ server.service_tenant }}
@@ -237,7 +240,9 @@
     - keystone: keystone_admin_tenant
     - keystone: keystone_roles
 
-{% for service_name, service in server.get('service', {}).iteritems() %}
+{%- endif %}
+
+{%- for service_name, service in server.get('service', {}).iteritems() %}
 
 keystone_{{ service_name }}_service:
   keystone.service_present:
@@ -280,7 +285,7 @@
 
 {% endif %}
 
-{% endfor %}
+{%- endfor %}
 
 {%- for tenant_name, tenant in server.get('tenant', {}).iteritems() %}