summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2010-08-06 21:50:30 +0000
committerBill Peck <bpeck@redhat.com>2010-08-06 21:50:30 +0000
commit7ae4700157a7c2f87c9ca6e605fae3edd48eccc1 (patch)
tree793954ae96b657fc2e750ae6189cf57bdc479943
parent8fb55a3be5e02c7ab888bc84f25b39b217dc6d11 (diff)
turn on proxy at right time. tweak wsgi configrh-tests-distribution-beaker-setup-1_1-49
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 937d097..ddc7026 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -298,6 +298,7 @@ function Inventory()
service iptables stop
# Turn on wsgi
perl -pi -e 's|^#LoadModule wsgi_module modules/mod_wsgi.so|LoadModule wsgi_module modules/mod_wsgi.so|g' /etc/httpd/conf.d/wsgi.conf
+ perl -pi -e 's|^WSGIDaemonProcess.*|WSGIDaemonProcess beaker user=apache group=apache display-name=beaker maximum-requests=10 processes=4 threads=1|g' /etc/httpd/conf.d/beaker-server.conf
service httpd restart
estatus_fail "**** Failed to start httpd ****"
service beakerd start
@@ -345,11 +346,12 @@ function LabController()
cobbler get-loaders
#service autofs start
service iptables stop
- service beaker-proxy start
- service beaker-watchdog start
rhts-sync-set -s READY
abort=$(rhts-sync-block -s SERVERREADY -s ABORT $SERVER)
echo "abort=$abort"
+ # We can start the proxies when our accounts have been created on the scheduler.
+ service beaker-proxy start
+ service beaker-watchdog start
# Add some distros
# NFS format HOSTNAME:DISTRONAME:NFSPATH
if [ -z "$NFSDISTROS" ]; then