Merge "Add alerts on log metrics"
diff --git a/keystone/files/_ldap.conf b/keystone/files/_ldap.conf
index 2b61fdd..5cfabd0 100644
--- a/keystone/files/_ldap.conf
+++ b/keystone/files/_ldap.conf
@@ -8,6 +8,9 @@
 {%- endif %}
 password = {{ ldap.password }}
 suffix = {{ ldap.suffix }}
+query_scope = {{ ldap.get("query_scope", "one") }}
+page_size = {{ ldap.get("page_size", "0") }}
+chase_referrals = {{ ldap.get("chase_referrals", False) }}
 
 # User mapping
 {%- if ldap.user_tree_dn is defined  %}
@@ -26,8 +29,9 @@
 user_allow_delete = false
 {%- endif %}
 user_enabled_attribute = {{ ldap.get("user_enabled_attribute", "nsAccountLock") }}
-user_enabled_default = False
-user_enabled_invert = true
+user_enabled_default = {{ ldap.get("user_enabled_default", False) }}
+user_enabled_invert = {{ ldap.get("user_enabled_invert", True) }}
+user_enabled_mask = {{ ldap.get("user_enabled_mask", 0) }}
 {%- if ldap.get('filter', {}).get('user', False) %}
 user_filter = {{ ldap.filter.user }}
 {%- endif %}
@@ -48,6 +52,9 @@
 group_allow_update = false
 group_allow_delete = false
 {%- endif %}
+{%- if ldap.get('filter', {}).get('group', False) %}
+group_filter = {{ ldap.filter.group }}
+{%- endif %}
 
 {%- if ldap.tls is defined %}