summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-05-18 14:18:48 +0000
committerBill Peck <bpeck@redhat.com>2009-05-18 14:18:48 +0000
commit0ed94a577ca90d7ba39a84da43ecf34e42820dd5 (patch)
treebeaff7f1337dc8f41f67254f82a689167ae68b69
parent8773a6ad3a5ed99e277e9af470c87bbc426a63f8 (diff)
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index cc559d3..a8af2fe 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -148,10 +148,10 @@ sqlalchemy.pool_recycle = 3600
# Authentication
identity.provider='ldapsa'
-identity.ldap.enabled=False
-#identity.soldapprovider.uri="ldaps://ldap.domain.com"
-#identity.soldapprovider.basedn="dc=domain,dc=com"
-#identity.soldapprovider.autocreate=True
+identity.ldap.enabled=$LDAPENABLED
+identity.soldapprovider.uri="ldaps://ldap.bos.redhat.com"
+identity.soldapprovider.basedn="dc=redhat,dc=com"
+identity.soldapprovider.autocreate=True
identity.krb_auth_principal='HTTP/$HOSTNAME@REDHAT.COM'
identity.krb_auth_keytab='/etc/httpd/conf/httpd.keytab'
@@ -228,6 +228,9 @@ function Inventory()
echo "create database beaker;" | mysql || result_fail
echo "grant all on beaker.* to 'beaker'@'localhost' IDENTIFIED BY 'beaker';" | mysql || result_fail
+ if [ -z "$LDAPENABLED" ]; then
+ LDAPENABLED="False"
+ fi
# Add in Kerberos config
generate_beaker_cfg