From 6a4d3eb55fb377a0ddef3d8978a85d2137430834 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Sat, 1 Aug 2015 09:19:18 -0500
Subject: [PATCH] Use keystone[ldap] for ldap packages
Keystone now provides an "ldap" in extras to install its ldap
dependencies so devstack doesn't have to track the python
dependencies itself.
Installation of the extras is done in an extra install line. This is
slightly redundant, however this pattern works much better from an
install stand point as it supports an arbitrarily large number of
extras.
Partial-Bug: 1479962
Change-Id: If0f0ff48f3d6b3c414f2d6fcd747ecf45a397658
---
lib/keystone | 5 +++++
lib/ldap | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/keystone b/lib/keystone
index b4b7df9a30..f7736147a7 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -506,6 +506,11 @@ function install_keystone {
fi
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
setup_develop $KEYSTONE_DIR
+
+ if is_service_enabled ldap; then
+ setup_develop $KEYSTONE_DIR ldap
+ fi
+
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
install_apache_wsgi
if is_ssl_enabled_service "key"; then
diff --git a/lib/ldap b/lib/ldap
index 65056aea2f..4cea812d3c 100644
--- a/lib/ldap
+++ b/lib/ldap
@@ -145,8 +145,6 @@ function install_ldap {
sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif
fi
- pip_install_gr ldappool
-
rm -rf $tmp_ldap_dir
}