diff options
| author | Ryan Lane <laner@controller> | 2010-11-30 23:12:19 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-11-30 23:12:19 +0000 |
| commit | aaee43a74264d5e6a4ccf638f882b19d477c3c9f (patch) | |
| tree | f1fc589aeae2cfc6e3cbb46d05a51d1f2c4fd92b /contrib | |
| parent | 89dbaf4f2607666914440f0eaec440659ed925d3 (diff) | |
| download | nova-aaee43a74264d5e6a4ccf638f882b19d477c3c9f.tar.gz | |
Added a script to use OpenDJ as an LDAP server instead of OpenLDAP. Also modified nova.sh to add an USE_OPENDJ option, that will be checked when USE_LDAP is set.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/nova.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index 1a9f93a3b1..7eb934eca9 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -22,6 +22,8 @@ USE_MYSQL=${USE_MYSQL:-0} MYSQL_PASS=${MYSQL_PASS:-nova} TEST=${TEST:-0} USE_LDAP=${USE_LDAP:-0} +# Use OpenDJ instead of OpenLDAP when using LDAP +USE_OPENDJ=${USE_OPENDJ:-0} LIBVIRT_TYPE=${LIBVIRT_TYPE:-qemu} NET_MAN=${NET_MAN:-VlanManager} # NOTE(vish): If you are using FlatDHCP on multiple hosts, set the interface @@ -113,7 +115,13 @@ if [ "$CMD" == "run" ]; then rm $NOVA_DIR/nova.sqlite fi if [ "$USE_LDAP" == 1 ]; then - sudo $NOVA_DIR/nova/auth/slap.sh + if [ "$USE_OPENDJ" == 1 ]; then + echo '--ldap_user_dn=cn=Directory Manager' >> \ + /etc/nova/nova-manage.conf + sudo $NOVA_DIR/nova/auth/opendj.sh + else + sudo $NOVA_DIR/nova/auth/slap.sh + fi fi rm -rf $NOVA_DIR/instances mkdir -p $NOVA_DIR/instances |