Browse code

Merge "Use keystone[ldap] for ldap packages"

Jenkins authored on 2016/01/08 19:11:53
Showing 2 changed files
... ...
@@ -506,6 +506,11 @@ function install_keystone {
506 506
     fi
507 507
     git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
508 508
     setup_develop $KEYSTONE_DIR
509
+
510
+    if is_service_enabled ldap; then
511
+        setup_develop $KEYSTONE_DIR ldap
512
+    fi
513
+
509 514
     if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
510 515
         install_apache_wsgi
511 516
         if is_ssl_enabled_service "key"; then
... ...
@@ -145,8 +145,6 @@ function install_ldap {
145 145
         sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif
146 146
     fi
147 147
 
148
-    pip_install_gr ldappool
149
-
150 148
     rm -rf $tmp_ldap_dir
151 149
 }
152 150