openstack/devstack
Code Issues Proposed changes

Merge "Use keystone[ldap] for ldap packages"

Browse Source
This commit is contained in:
Jenkins 2016-01-08 10:11:53 +00:00 committed by Gerrit Code Review
commit 828936c6ac
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/keystone
View File

@ -506,6 +506,11 @@ function install_keystone {
fi fi
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
setup_develop $KEYSTONE_DIR setup_develop $KEYSTONE_DIR
if is_service_enabled ldap; then
setup_develop $KEYSTONE_DIR ldap
fi
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
install_apache_wsgi install_apache_wsgi
if is_ssl_enabled_service "key"; then if is_ssl_enabled_service "key"; then

2
lib/ldap
View File

@ -145,8 +145,6 @@ function install_ldap {
sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif
fi fi
pip_install_gr ldappool
rm -rf $tmp_ldap_dir rm -rf $tmp_ldap_dir
} }