summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-21 02:41:33 +0000
committerGerrit Code Review <review@openstack.org>2013-02-21 02:41:33 +0000
commitc6b978cbb80adbe33f70fa021d60a73802601f20 (patch)
tree188e10406cb10f7f550ceac4ab36b4b3d57f2f42 /etc
parentd036db145d51f8b134ffa36165065a8986e4f8a1 (diff)
parent408a1d57d729461056507283c58d6c48403554b8 (diff)
Merge "enabled attribute emulation support"
Diffstat (limited to 'etc')
-rw-r--r--etc/keystone.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 6e810fc6..4a481576 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -156,6 +156,8 @@
# user_allow_create = True
# user_allow_update = True
# user_allow_delete = True
+# user_enabled_emulation = False
+# user_enabled_emulation_dn =
# tenant_tree_dn = ou=Groups,dc=example,dc=com
# tenant_filter =
@@ -169,6 +171,8 @@
# tenant_allow_create = True
# tenant_allow_update = True
# tenant_allow_delete = True
+# tenant_enabled_emulation = False
+# tenant_enabled_emulation_dn =
# role_tree_dn = ou=Roles,dc=example,dc=com
# role_filter =