[NEW PATCH] BZ#731598 Use the correct port in waitRouteRestore (via gerrit-bot)
Federico Simoncelli
fsimonce at redhat.com
Thu Aug 18 12:51:20 UTC 2011
New patch submitted by Federico Simoncelli (fsimonce at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/830
commit 74eb4246985a3466eff012ae5f899b4eb4d8f759
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Thu Aug 18 12:29:59 2011 +0000
BZ#731598 Use the correct port in waitRouteRestore
Change-Id: Iaef8d5305a6c4eeab53a622a7693261e9b9cb8e1
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 7929f36..f00cca0 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -552,15 +552,17 @@ gpgcheck=0
self._xmlOutput('CreateConf', self.status, None, None, self.message)
return self.rc
- def _addNetwork(self, vdcName):
+ def _addNetwork(self, vdcName, vdcPort):
fReturn = True
#add rhevm bridge
try:
fReturn = deployUtil.makeBridge(vdcName, VDSM_DIR)
if fReturn: #save current config by removing the undo files:
+ vdcUrl = "http://%s:%s" % (
+ vdcName, str(vdcPort) if vdcPort else "80")
try:
- if not deployUtil.waitRouteRestore(60, vdcName):
+ if not deployUtil.waitRouteRestore(60, vdcUrl)
fReturn = False
self.message = "No route to VDC. Check switch/router settings and try registration again"
logging.error(self.message)
@@ -604,7 +606,7 @@ gpgcheck=0
logging.error(self.message)
#Do not set rc to allow changes from rhev-m.
else:
- self._addNetwork(url)
+ self._addNetwork(url, port)
self._xmlOutput('SetNetworking', self.status, None, None, self.message)
return self.rc
More information about the vdsm-patches
mailing list