openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Keystone/LDAP integration"

This commit is contained in:
Jenkins 2014-09-03 09:10:57 +00:00 committed by Gerrit Code Review
parent c2ad9ff357 6aa37dc7fd
commit cea8a57ac3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/keystone/install.d/keystone-package-install/05-keystone
View File

@ -2,7 +2,7 @@
set -eux
install-packages openstack-keystone
install-packages openstack-keystone python-ldap
KEYSTONE_USER=keystone
if [ "opensuse" = "$DISTRO_NAME" ]; then

8
elements/keystone/install.d/keystone-source-install/70-keystone
View File

@ -19,6 +19,14 @@ sysctl-append-value net.ipv4.ip_local_reserved_ports 35357
install -m 0755 -o root -g root $(dirname $0)/../cleanup-keystone-tokens.sh /usr/local/bin
install -m 0640 -o root -g root $(dirname $0)/../keystone.crontab /etc/cron.d/keystone
# LDAP backend support
if which dpkg; then
install-packages libldap2-dev libsasl2-dev libssl-dev
else
install-packages openldap-devel
fi
$KEYSTONE_VENV_DIR/bin/pip install -U python-ldap ldappool
# percona-tookit is NOT supported on Fedora (retrieved 25-06-2013)
# http://www.percona.com/mysql-support/policies/percona-toolkit-supported-platforms-and-versions
if [[ "ubuntu rhel rhel7 centos" =~ "$DISTRO_NAME" ]]; then