summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-05-26 15:04:43 -0400
committerBill Peck <bpeck@redhat.com>2009-05-26 15:04:43 -0400
commit3b1ea66fee0e6e71433cd0dacf746fe051aa5143 (patch)
tree3d4b8e8b8c82f44c0e6a703c3278a12e55eda547
parent999c9770dffaada15a4f7a2766f02d1e1bac329d (diff)
newer cobbler doesnt like trailing slash
-rw-r--r--Server/beaker/server/model.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Server/beaker/server/model.py b/Server/beaker/server/model.py
index 3c873a1..43740df 100644
--- a/Server/beaker/server/model.py
+++ b/Server/beaker/server/model.py
@@ -1012,12 +1012,12 @@ class System(SystemObject):
if self.lab_controller:
labcontroller = self.lab_controller
try:
- url = "http://%s/cobbler_api_rw/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api_rw" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)
except ProtocolError:
- url = "http://%s/cobbler_api/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)
@@ -1048,12 +1048,12 @@ class System(SystemObject):
labcontroller = self.lab_controller
try:
- url = "http://%s/cobbler_api_rw/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api_rw" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)
except ProtocolError:
- url = "http://%s/cobbler_api/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)
@@ -1113,12 +1113,12 @@ class System(SystemObject):
labcontroller = self.lab_controller
try:
- url = "http://%s/cobbler_api_rw/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api_rw" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)
except ProtocolError:
- url = "http://%s/cobbler_api/" % labcontroller.fqdn
+ url = "http://%s/cobbler_api" % labcontroller.fqdn
remote = xmlrpclib.ServerProxy(url, allow_none=True)
token = remote.login(labcontroller.username,
labcontroller.password)