commit 1f84d457577162421bfd2de63bd83d80c123a32f
author Jenkins <jenkins@review.openstack.org> Sun Oct 30 10:13:53 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sun Oct 30 10:13:53 2016 +0000
tree 0db3c85d69bca60d7a9f256cd65b332dfe4851f2
parent 7b07ccf5e4b7f724eceedb069a51c29284b357aa
parent d5f730caf41430a142fcf37b216dfa4d69ec4d2c

Merge "lib/neutron: Remove remaining references to Q_ variables"

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index f9ee8eb..b2dfa83 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -221,13 +221,6 @@
         iniset $KEYSTONE_CONF ldap password $LDAP_PASSWORD
         iniset $KEYSTONE_CONF ldap user $LDAP_MANAGER_DN
         iniset $KEYSTONE_CONF ldap suffix $LDAP_BASE_DN
-        iniset $KEYSTONE_CONF ldap use_dumb_member "True"
-        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"
-        iniset $KEYSTONE_CONF ldap tenant_tree_dn "ou=Projects,$LDAP_BASE_DN"
-        iniset $KEYSTONE_CONF ldap user_domain_id_attribute "businessCategory"
         iniset $KEYSTONE_CONF ldap user_tree_dn "ou=Users,$LDAP_BASE_DN"
         iniset $KEYSTONE_CONF DEFAULT member_role_id "9fe2ff9ee4384b1894a90878d3e92bab"
         iniset $KEYSTONE_CONF DEFAULT member_role_name "_member_"