openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Use pkg-map for keystone source-install"

This commit is contained in:
Jenkins 2014-09-19 19:47:51 +00:00 committed by Gerrit Code Review
parent e22b35cee0 c067fb515c
commit f3fce641c4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,11 +20,7 @@ install -m 0755 -o root -g root $(dirname $0)/../cleanup-keystone-tokens.sh /usr
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
install-packages -m keystone ldap_devel_package sasl_devel_package ssl_devel_package
$KEYSTONE_VENV_DIR/bin/pip install -U python-ldap ldappool
# percona-tookit is NOT supported on Fedora (retrieved 25-06-2013)

19
elements/keystone/pkg-map Normal file
View File

@ -0,0 +1,19 @@
{
"family": {
"redhat": {
"ldap_devel_package": "openldap-devel",
"sasl_devel_package": "cyrus-sasl-devel",
"ssl_devel_package": "openssl-devel"
},
"debian": {
"ldap_devel_package": "libldap2-dev",
"sasl_devel_package": "libsasl2-dev",
"ssl_devel_package": "libssl-dev"
},
"suse": {
"ldap_devel_package": "openldap2-devel",
"sasl_devel_package": "cyrus-sasl-devel",
"ssl_devel_package": "libopenssl-devel"
}
}
}