From 0fa6f9789158a2de92a4e78755180ba9035c467a Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 16 Jul 2018 17:33:38 +0200
Subject: [PATCH] Switch to python-ldap

pyldap is deprecated and merged with python-ldap, so we should depend
on it directly instead of the deprecated wrapper. For details see
https://pypi.org/project/pyldap/

Change-Id: I2c8ee2c792a476fe12c234a55af24144e6b511cd
Depends-On: https://review.openstack.org/#/c/582973/
---
 doc/requirements.txt                                     | 2 +-
 lower-constraints.txt                                    | 2 +-
 releasenotes/notes/use-python-ldap-0318ff7798bdd98d.yaml | 6 ++++++
 setup.cfg                                                | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/use-python-ldap-0318ff7798bdd98d.yaml

diff --git a/doc/requirements.txt b/doc/requirements.txt
index fde3699e3b..49e992cdf4 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -6,5 +6,5 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
 reno>=2.5.0 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
-pyldap>=2.4.20 # PSF
+python-ldap>=3.0.0  # PSF
 ldappool>=2.0.0 # MPL
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 5b46d81a4b..43f2b016cb 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -92,7 +92,7 @@ pycparser==2.18
 pyflakes==0.8.1
 Pygments==2.2.0
 pyinotify==0.9.6
-pyldap===2.4.20
+python-ldap===3.0.0
 pymongo===3.0.2
 PyMySQL==0.8.0
 PyNaCl==1.2.1
diff --git a/releasenotes/notes/use-python-ldap-0318ff7798bdd98d.yaml b/releasenotes/notes/use-python-ldap-0318ff7798bdd98d.yaml
new file mode 100644
index 0000000000..1cbbce2b91
--- /dev/null
+++ b/releasenotes/notes/use-python-ldap-0318ff7798bdd98d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - Keystone now relies on python-ldap instead of pyldap.
+    The pyldap library is a deprecated fork from python-ldap. Starting
+    with python-ldap 3.0 release this has been merged and is maintained
+    there.
diff --git a/setup.cfg b/setup.cfg
index 7a2c859efc..10029d8c26 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ packages =
 
 [extras]
 ldap =
-  pyldap>=2.4.20 # PSF
+  python-ldap>=3.0.0 # PSF
   ldappool>=2.0.0 # MPL
 memcache =
   python-memcached>=1.56 # PSF