Merge "Use keystone[ldap] for ldap packages"

2016-01-08 10:11:53 +00:00 · 2016-01-08 10:11:53 +00:00 · 828936c6ac
commit 828936c6ac
parent 7792bd2025 6a4d3eb55f
2 changed files with 5 additions and 2 deletions
--- 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
--- 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
 }