summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2012-05-01 15:52:50 -0400
committerBill Peck <bpeck@redhat.com>2012-05-01 15:52:50 -0400
commitc64d17ec7f17b6723002082556375450f1391523 (patch)
treeac00a2e7a7a1b0eeab1d3c867661540b671c202c
parentba440184bbe20be71ce34c5ee0ef1ebbd4b4eb49 (diff)
Update beaker setup task to configure beaker-provision.beaker-distribution-beaker-setup-1_4-76
Remove most of cobbler setup code. Still need to use cobbler to get the pxe loaders.
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh15
1 files changed, 4 insertions, 11 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 595b7e7..572a5d4 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -149,25 +149,18 @@ function LabController()
rlRun "chkconfig httpd on"
rlRun "chkconfig xinetd on"
rlRun "chkconfig tftp on"
- rlRun "chkconfig cobblerd on"
- #FIXME edit /etc/cobbler/settings
- perl -pi -e "s|^server: 127.0.0.1|server: $HOSTNAME|g" /etc/cobbler/settings
- perl -pi -e "s|^next_server: 127.0.0.1|next_server: $ipaddress|g" /etc/cobbler/settings
- perl -pi -e "s|^pxe_just_once: 0|pxe_just_once: 1|g" /etc/cobbler/settings
- perl -pi -e "s|^anamon_enabled: 0|anamon_enabled: 1|g" /etc/cobbler/settings
- #FIXME edit /etc/cobbler/modules.conf
- # enable testing auth module
- perl -pi -e "s|^module = authn_denyall|module = authn_testing|g" /etc/cobbler/modules.conf
# Configure beaker-proxy config
generate_proxy_cfg
# 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
- rlServiceStart httpd xinetd cobblerd autofs
+ rlServiceStart httpd xinetd cobblerd
+ # Using cobbler to get the netboot loaders..
rlRun "cobbler get-loaders" 0 "get network boot loaders"
rlServiceStop iptables
rlRun "rhts-sync-set -s READY" 0 "Lab Controller ready"
rlRun "rhts-sync-block -s SERVERREADY -s ABORT $SERVER" 0 "Wait for Server to become ready"
- rlServiceStart beaker-proxy beaker-watchdog beaker-transfer
+ rlServiceStart beaker-proxy beaker-watchdog beaker-provision
+ # There is beaker-transfer as well but its disabled by default
rlRun "rhts-sync-set -s DONE" 0 "Lab Controller done"
rlPhaseEnd
rlJournalEnd