From dfec5ade4c323a01b7b50edd604bd3379c49b376 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam+git@yaple.net>
Date: Fri, 16 Aug 2019 17:12:20 -0400
Subject: [PATCH] python-ldap fix

In rocky and beyond pyldap becomes python-ldap. The structure of the
previous patch to fix them means we must always update the pydep.txt
list with a new release of openstack.

Reordering this we can explictly install only when the version is older
than rocky. Added openstack releases back to the Newton release for
compatibility.

Change-Id: Ibf88bd2113029d750f9a4f32e288e3d8be3a1bfd
---
 pydep.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pydep.txt b/pydep.txt
index f068818a..54daa578 100644
--- a/pydep.txt
+++ b/pydep.txt
@@ -3,8 +3,8 @@ fluent-logger   [fluent]
 ldappool        [(keystone ldap)]
 libvirt-python  [nova]
 purestorage     [(cinder purestorage) (nova purestorage)]
-pyldap          [(!rocky !master keystone ldap)]
+pyldap          [(newton keystone ldap) (ocata keystone ldap) (pike keystone ldap) (queens keystone ldap)]
 pymysql         []
-python-ldap     [(rocky keystone ldap) (master keystone ldap)]
+python-ldap     [(!newton !ocata !pike !queens keystone ldap)]
 python-memcached []
 uwsgi           []