Change in vdsm[master]: vdsm-reg: move OK message to caller.

dougsland at redhat.com dougsland at redhat.com
Thu May 2 18:49:09 UTC 2013


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm-reg: move OK message to caller.
......................................................................

vdsm-reg: move OK message to caller.

Due bz#890572 engine.py now calls setVdsConf() to write into vdsm_reg.conf.
However, setVdsConf() prints an 'OK' message used in the old bootstrap and
it's showing in oVirt TUI. This patch will move this OK message to the
caller.

Change-Id: Ifaea56ca3f9f9a4f5e60c684dae9ae1f17f63a1e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=925967
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M vdsm_reg/deployUtil.py.in
M vdsm_reg/vdsm-complete
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/14393/1

diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 3b056ca..bfd1243 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -330,7 +330,6 @@
             logging.debug("setVdsConf: saving new config file")
             ovirtfunctions.ovirt_store_config(confFile)
 
-        print "<BSTRAP component='VDS Configuration' status='OK'/>"
     except Exception as e:
         msg = escapeXML(str(e))
         print "<BSTRAP component='VDS Configuration' status='FAIL' " \
diff --git a/vdsm_reg/vdsm-complete b/vdsm_reg/vdsm-complete
index 316925e..25ab22e 100755
--- a/vdsm_reg/vdsm-complete
+++ b/vdsm_reg/vdsm-complete
@@ -74,6 +74,7 @@
             fOK = deployUtil.setVdsConf(vds_config_str, VDSM_CONF_FILE)
 
         if fOK:
+            print "<BSTRAP component='VDS Configuration' status='OK'/>"
             deployUtil.setService("vdsmd", "reconfigure")
             reboot(act)
     except:


--
To view, visit http://gerrit.ovirt.org/14393
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaea56ca3f9f9a4f5e60c684dae9ae1f17f63a1e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>


More information about the vdsm-patches mailing list