Merge "Install ldappool when LDAP is enabled"

Jenkins · openstack-gerrit · commit 89d378e4bb40 · 2014-10-28T03:24:15.000Z
diff --git a/lib/ldap b/lib/ldap
@@ -139,6 +139,8 @@ function install_ldap {
         sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif
     fi
 
+    pip_install ldappool
+
     rm -rf $tmp_ldap_dir
 }
 

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ function install_ldap {`
`139`	`139`	`sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif`
`140`	`140`	`fi`
`141`	`141`
	`142`	`+ pip_install ldappool`
	`143`	`+`
`142`	`144`	`rm -rf $tmp_ldap_dir`
`143`	`145`	`}`
`144`	`146`