commit 3c5247fac956294c9209d69145e4ff6ee2e52baf
author Jenkins <jenkins@review.openstack.org> Tue Oct 01 02:22:08 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Oct 01 02:22:08 2013 +0000
tree cf4adc9e8e580a08c5516e860851f4360b161ab8
parent b48e00816984cee78b3e9be5cce000eba5b42ab0
parent 6d23500aa66e3d399cd263c2fb1d07dba0e0170c

Merge "Default to the ML2 plugin in Neutron instead of OVS"

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index c4b2dff..699b94a 100755
--- a/lib/keystone
+++ b/lib/keystone
@@ -145,7 +145,7 @@
         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 user_attribute_ignore "enabled,email,tenants,default_project_id"
         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"