From 929e1114722825fdc48e67922956825ef1651583 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Mon, 4 Dec 2017 14:21:00 -0600
Subject: [PATCH] Remove python-ldap and add pyldap

Keystone moved from python-ldap to pyldap in the Newton release and
python-ldap now requires a version of pyasn1-modules that exceeds
the upper-constraint in Ocata, which breaks repo builds.

This patch removes python-ldap and adds pyldap in its place.

Closes-Bug: 1736241
Change-Id: I55f1fcd928c70eff3488af50d3dddb588082eb43
(cherry picked from commit ffc9c9b5e681748ff3e54e43f22c921e83342a51)
---
 defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index a840db48e..e1f4b87fd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -427,14 +427,14 @@ keystone_pip_packages:
   - keystonemiddleware
   - ldappool
   - lxml
-  - PyMySQL
   - oslo.log
   - oslo.middleware
   - pbr
   - pycrypto
+  - pyldap
+  - PyMySQL
   - pysaml2
   - python-keystoneclient
-  - python-ldap
   - python-memcached
   - python-openstackclient
   - repoze.lru