Merge "Explicitly add cosine and inetorgperson schemas on Fedora"
This commit is contained in:
commit
5e482c9ea2
6
lib/ldap
6
lib/ldap
@ -37,6 +37,12 @@ function install_ldap() {
|
|||||||
#update ldap olcdb
|
#update ldap olcdb
|
||||||
sudo ldapmodify -Y EXTERNAL -H ldapi:/// -f $TMP_MGR_DIFF_FILE
|
sudo ldapmodify -Y EXTERNAL -H ldapi:/// -f $TMP_MGR_DIFF_FILE
|
||||||
|
|
||||||
|
# On fedora we need to manually add cosine and inetorgperson schemas
|
||||||
|
if is_fedora; then
|
||||||
|
sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/cosine.ldif
|
||||||
|
sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif
|
||||||
|
fi
|
||||||
|
|
||||||
# add our top level ldap nodes
|
# add our top level ldap nodes
|
||||||
if ldapsearch -x -w $LDAP_PASSWORD -H ldap://localhost -D dc=Manager,dc=openstack,dc=org -x -b dc=openstack,dc=org | grep -q "Success" ; then
|
if ldapsearch -x -w $LDAP_PASSWORD -H ldap://localhost -D dc=Manager,dc=openstack,dc=org -x -b dc=openstack,dc=org | grep -q "Success" ; then
|
||||||
printf "LDAP already configured for OpenStack\n"
|
printf "LDAP already configured for OpenStack\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user