commit f41024e4b0b39f4b2d5d6bdb4873010f2e625b42
author Brad Topol <btopol@us.ibm.com> Tue Feb 19 15:36:41 2013 -0600
committer Brad Topol <btopol@us.ibm.com> Fri Feb 22 14:41:54 2013 -0600
tree 9225c98b517c3b531694f3a61aaf67dbe18f3275
parent 2299ebfc38d895b57d1eaa25f50e5dc42ba39cb7

Fixes Bug1130377  devstack ldap set values in keystone.conf

Addressed reviewers comments and added some extra properties
needed by latest version of keystone.
This fix sets some needed values in keystone.conf to ensure
that keystone can add entries to LDAP and remain schema
compliant.  It creates a new special role (_member_) that
is needed by the latest version of keystone and also
fixes tenant_id to be tenantId.

Change-Id: Ia2a1ebb7cbedb0af106c74aa9181843cc9739f5d

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 866c62e..a1a57f8 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -99,6 +99,16 @@
         iniset $KEYSTONE_CONF ldap password  $LDAP_PASSWORD
         iniset $KEYSTONE_CONF ldap user "dc=Manager,dc=openstack,dc=org"
         iniset $KEYSTONE_CONF ldap suffix "dc=openstack,dc=org"
+        iniset $KEYSTONE_CONF ldap use_dumb_member "True"
+        iniset $KEYSTONE_CONF ldap user_attribute_ignore "enabled,email,tenants,tenantId"
+        iniset $KEYSTONE_CONF ldap tenant_attribute_ignore "enabled"
+        iniset $KEYSTONE_CONF ldap tenant_domain_id_attribute "businessCategory"
+        iniset $KEYSTONE_CONF ldap tenant_desc_attribute "description"
+        iniset $KEYSTONE_CONF ldap tenant_tree_dn "ou=Projects,dc=openstack,dc=org"
+        iniset $KEYSTONE_CONF ldap user_domain_id_attribute "businessCategory"
+        iniset $KEYSTONE_CONF ldap user_tree_dn "ou=Users,dc=openstack,dc=org"
+        iniset $KEYSTONE_CONF DEFAULT member_role_id "9fe2ff9ee4384b1894a90878d3e92bab"
+        iniset $KEYSTONE_CONF DEFAULT member_role_name "_member_"
     fi
 
     if [[  "$KEYSTONE_IDENTITY_BACKEND" == "ldap"  ]]; then