From 93341d61081c148e53b36e3ab39de97656f2a2c9 Mon Sep 17 00:00:00 2001
From: Aaron Tan <jangsutsr@gmail.com>
Date: Fri, 22 Sep 2017 09:48:32 -0400
Subject: [PATCH] Revert "Add Tower Configuration setting
 AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR"

---
 awx/sso/conf.py   | 11 -----------
 awx/sso/fields.py |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/awx/sso/conf.py b/awx/sso/conf.py
index 8994f70785..e04f091851 100644
--- a/awx/sso/conf.py
+++ b/awx/sso/conf.py
@@ -293,17 +293,6 @@ register(
     default='MemberDNGroupType',
 )
 
-register(
-    'AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR',
-    field_class=fields.CharField,
-    default='member',
-    label=_('LDAP Group Type Member Attribute'),
-    help_text=_('Specify member_attr when AUTH_LDAP_GROUP_TYPE=MemberDNGroupType.'),
-    category=_('LDAP'),
-    category_slug='ldap',
-    feature_required='ldap',
-)
-
 register(
     'AUTH_LDAP_REQUIRE_GROUP',
     field_class=fields.LDAPDNField,
diff --git a/awx/sso/fields.py b/awx/sso/fields.py
index 8771057a34..0ff4b902a5 100644
--- a/awx/sso/fields.py
+++ b/awx/sso/fields.py
@@ -323,8 +323,7 @@ class LDAPGroupTypeField(fields.ChoiceField):
         if not data:
             return None
         if data.endswith('MemberDNGroupType'):
-            from django.conf import settings
-            return getattr(django_auth_ldap.config, data)(member_attr=settings.AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR)
+            return getattr(django_auth_ldap.config, data)(member_attr='member')
         else:
             return getattr(django_auth_ldap.config, data)()