Change in vdsm[master]: Add eclipse and PyDev project files to .gitignore
by masayag@redhat.com
Moti Asayag has uploaded a new change for review.
Change subject: Add eclipse and PyDev project files to .gitignore
......................................................................
Add eclipse and PyDev project files to .gitignore
PyDev as eclipse plugin is commonly used for developing python under
eclipse IDE. It produces several files that could be ignored:
.project - produced by eclipse to describe the project
.pydevproject - produced vy PyDev plugin.
Change-Id: I5e65b2527215f45158cb2b6e748f5416fe29577e
Signed-off-by: Moti Asayag <masayag(a)redhat.com>
---
M .gitignore
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/7352/1
diff --git a/.gitignore b/.gitignore
index 6a406ef..8a63a02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
*.swp
*.tmp
*~
+.project
+.pydevproject
.deps/
INSTALL
Makefile
--
To view, visit http://gerrit.ovirt.org/7352
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e65b2527215f45158cb2b6e748f5416fe29577e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Preserve MTU on bond/nic when VLAN without MTU added
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: Preserve MTU on bond/nic when VLAN without MTU added
......................................................................
Preserve MTU on bond/nic when VLAN without MTU added
Change-Id: I48ef1ddd11ae3a9d450d55cf5c68be3b83af5b03
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 16 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/7322/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 7374ef5..199adfa 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -368,16 +368,23 @@
gateway=None, bootproto=None, mtu=None, onboot='yes', **kwargs):
""" Create ifcfg-* file with proper fields per device """
cf = self.NET_CONF_PREF + name
+ # Check whether we need to preserve prev ip/mask/gateway/mtu
+ confParams = None
+ if os.path.exists(cf):
+ confParams = self._getConfigValue(cf, ['IPADDR', 'NETMASK',
+ 'GATEWAY', 'MTU'])
+
cfg = """DEVICE=%s\nONBOOT=%s\n""" % (pipes.quote(name),
pipes.quote(onboot))
cfg += conf
- # Check whether we need to preserve prev ip/mask/gateway
- if not ipaddr and os.path.exists(cf):
- confParams = self._getConfigValue(cf, ['IPADDR', 'NETMASK',
- 'GATEWAY'])
- ipaddr = confParams['IPADDR']
- netmask = confParams['NETMASK']
- gateway = confParams['GATEWAY']
+
+ if confParams:
+ if not ipaddr:
+ ipaddr = confParams['IPADDR']
+ netmask = confParams['NETMASK']
+ gateway = confParams['GATEWAY']
+ if not mtu:
+ mtu = confParams['MTU']
if ipaddr:
cfg = cfg + 'IPADDR=%s\nNETMASK=%s\n' % (pipes.quote(ipaddr),
@@ -392,7 +399,8 @@
cfg = cfg + 'BOOTPROTO=%s\n' % pipes.quote(bootproto)
if mtu:
- cfg = cfg + 'MTU=%d\n' % mtu
+ cfg = cfg + 'MTU=%s\n' % mtu
+
cfg += 'NM_CONTROLLED=no\n'
BLACKLIST = ['TYPE', 'NAME', 'DEVICE', 'bondingOptions',
'force', 'blockingdhcp',
--
To view, visit http://gerrit.ovirt.org/7322
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48ef1ddd11ae3a9d450d55cf5c68be3b83af5b03
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Optimize _getConfigValue to return multiple values
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: Optimize _getConfigValue to return multiple values
......................................................................
Optimize _getConfigValue to return multiple values
Change-Id: I15ff5542095d51f33f5f1970b81a4a0cbfb30632
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/7306/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 7e3379e..fb283ff 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -373,9 +373,11 @@
cfg += conf
# Check whether we need to preserve prev ip/mask/gateway
if not ipaddr and os.path.exists(cf):
- ipaddr = self._getConfigValue(cf, 'IPADDR')
- netmask = self._getConfigValue(cf, 'NETMASK')
- gateway = self._getConfigValue(cf, 'GATEWAY')
+ confParams = self._getConfigValue(cf, ['IPADDR', 'NETMASK',
+ 'GATEWAY'])
+ ipaddr = confParams['IPADDR']
+ netmask = confParams['NETMASK']
+ gateway = confParams['GATEWAY']
if ipaddr:
cfg = cfg + 'IPADDR=%s\nNETMASK=%s\n' % (pipes.quote(ipaddr),
@@ -485,12 +487,12 @@
self._backup(self.NET_CONF_PREF + bridge)
self._removeFile(self.NET_CONF_PREF + bridge)
- def _getConfigValue(self, conffile, entry):
+ def _getConfigValue(self, conffile, entries):
"""
- Get value from network configuration file
+ Get values from network configuration file
- :param entry: entry to look for (entry=value)
- :type entry: string
+ :param entry: entries to look for (entry=value)
+ :type entry: list
:returns: value for entry (or None)
:rtype: string
@@ -498,13 +500,14 @@
Search for entry in conffile and return
its value or None if not found
"""
+ confParams = dict(zip(entries, len(entries)*[None]))
with open(conffile) as f:
- entries = [ line for line in f.readlines()
- if line.startswith(entry + '=') ]
- if len(entries) != 0:
- value = entries[0].split('=', 1)[1]
- return value.strip()
- return None
+ for line in f.readlines():
+ key, val = line.split('=', 1)
+ if key.strip() in confParams:
+ confParams[key.strip()] = val.strip()
+
+ return confParams
def _updateConfigValue(self, conffile, entry, value, delete=False):
"""
@@ -551,7 +554,7 @@
"""
for nic in nics:
cf = self.NET_CONF_PREF + nic
- mtuval = self._getConfigValue(cf, 'MTU')
+ mtuval = self._getConfigValue(cf, ['MTU'])['MTU']
if not mtuval is None:
if int(mtuval) > mtu:
mtu = mtuval
@@ -570,7 +573,7 @@
"""
_netinfo = netinfo.NetInfo()
cf = self.NET_CONF_PREF + bridge
- currmtu = self._getConfigValue(cf, 'MTU')
+ currmtu = self._getConfigValue(cf, ['MTU'])['MTU']
if currmtu is None:
return
@@ -591,7 +594,7 @@
if vlan == delvlan:
continue
cf = self.NET_CONF_PREF + vlan
- mtu = self._getConfigValue(cf, 'MTU')
+ mtu = self._getConfigValue(cf, ['MTU'])['MTU']
newmtu = max(newmtu, mtu)
if newmtu != currmtu:
--
To view, visit http://gerrit.ovirt.org/7306
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ff5542095d51f33f5f1970b81a4a0cbfb30632
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Fix vdsm-faqemu VM launch failure on hosts with newer libvir...
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Fix vdsm-faqemu VM launch failure on hosts with newer libvirt
......................................................................
Fix vdsm-faqemu VM launch failure on hosts with newer libvirt
Since January 2012, libvirt now checks[1] for the presence of /dev/kvm before
starting a VM to generate better error messages when a VM doesn't start.
This breaks faqemu running in a VM (non-nested) or a host which doesn't have KVM
modules loaded. Work around this by touching the device node.
1. libvirt commit hash 32f63e912d3bef42a7fa70a0f2d5b04b98afe936
Change-Id: I1dc88f2931e8f716c1732a51d9f65f600f4fd1ef
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vdsm_hooks/faqemu/vdsm-faqemu
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/7223/1
diff --git a/vdsm_hooks/faqemu/vdsm-faqemu b/vdsm_hooks/faqemu/vdsm-faqemu
index 218af7f..a36a87c 100644
--- a/vdsm_hooks/faqemu/vdsm-faqemu
+++ b/vdsm_hooks/faqemu/vdsm-faqemu
@@ -19,4 +19,7 @@
qemu_argv += [ "-no-kvm" ]
qemu_argv += filter(lambda x: x != "-enable-kvm", sys.argv[1:])
+# libvirt 0.9.10+ checks for the presence of /dev/kvm to provide
+# better error messages, but this breaks this hook, fake it out
+os.system("touch /dev/kvm")
os.execv(qemu_bin, qemu_argv)
--
To view, visit http://gerrit.ovirt.org/7223
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dc88f2931e8f716c1732a51d9f65f600f4fd1ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 10 months
Change in vdsm[master]: BZ#848299 - Fix delete VLANed network with MTU=9000
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: BZ#848299 - Fix delete VLANed network with MTU=9000
......................................................................
BZ#848299 - Fix delete VLANed network with MTU=9000
Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/7214/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 9dffcdd..1f494c5 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -551,8 +551,8 @@
return
if bonding:
- # FIXME! Check whether we need to care of bridgeless too
- _, vlans = _netinfo.getBridgedNetworksAndVlansForIface(bonding)
+ iface_bridged = _netinfo.getBridgedNetworksAndVlansForIface(bonding)
+ vlans = [v for (_, v) in iface_bridged]
delvlan = bonding + '.' + delvlan
else:
vlans = _netinfo.getVlansForNic(nics[0])
@@ -562,7 +562,7 @@
for vlan in vlans:
if vlan == delvlan:
continue
- cf = self.NET_CONF_PREF + vlan
+ cf = self.NET_CONF_PREF + delvlan
mtu = self._getConfigValue(cf, 'MTU')
newmtu = max(newmtu, mtu)
--
To view, visit http://gerrit.ovirt.org/7214
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I485c8bd3dfa84c421dab2c5d121ad7a5efc348a3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Fix a race existing in the singleton interface of clientIF
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: Fix a race existing in the singleton interface of clientIF
......................................................................
Fix a race existing in the singleton interface of clientIF
There's a race in getInstance() between clientIF initialization and MOM thread.
If for some reason the initialization of clientIF is slowed down and not finished
before MOM calls vdsm API, an exception will happen in MOM thread due to that
the parameter 'log' is missing. The fix is just moving the parameter check into
the protection of the singleton lock. Then MOM thread will be blocked if it tries
to access vdsm API when the initialization of clientIF is ongoing.
Change-Id: I6d907f5613963438c99749da674bb6588a23fe38
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm/clientIF.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/7283/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 8ba25a7..ab34eaa 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -117,13 +117,13 @@
@classmethod
def getInstance(cls, log=None):
- if cls._instance == None:
- if log == None:
- raise Exception("Logging facility is required to create \
- the single clientIF instance")
with cls._instanceLock:
if cls._instance == None:
- cls._instance = clientIF(log)
+ if log == None:
+ raise Exception("Logging facility is required to create "
+ "the single clientIF instance")
+ else:
+ cls._instance = clientIF(log)
return cls._instance
def _getServerIP(self, addr=None):
--
To view, visit http://gerrit.ovirt.org/7283
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d907f5613963438c99749da674bb6588a23fe38
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: bootstrap: return proper exit code from bootstrap scripts
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: return proper exit code from bootstrap scripts
......................................................................
bootstrap: return proper exit code from bootstrap scripts
This is quick and dirty solution to return valid exit code from
bootstrap scripts, until now exit code of vds_bootstrap* was wrong,
however the vds_bootstrap.py did not check for exit code at all, and...
engine did not as well.
Now engine checks return code so proper code is requried.
Change-Id: I5cf1d2ad402641394da52099c157fc34cf49cad1
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vds_bootstrap/setup
M vds_bootstrap/vds_bootstrap.py
M vds_bootstrap/vds_bootstrap_complete.py
3 files changed, 32 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/7301/1
diff --git a/vds_bootstrap/setup b/vds_bootstrap/setup
index 966b457..d3352d7 100755
--- a/vds_bootstrap/setup
+++ b/vds_bootstrap/setup
@@ -173,11 +173,16 @@
execfn += [random_num]
execfn.append(str(int(rebootAfterInstallation)))
logging.debug("trying to run %s script cmd = '%s'",script, string.join(execfn, " "))
- subprocess.Popen(execfn).communicate()
+ proc = subprocess.Popen(execfn)
+ proc.communicate()
+ if proc.returncode == 0:
+ return True
else:
logging.debug("script %s doen not exist",script)
except:
logging.error(traceback.format_exc())
+
+ return False
def process_ovirt_platform(url_bs, engine_port, random_num, systime, engine_ssh_key):
@@ -340,7 +345,24 @@
else:
vds_script = './vds_bootstrap_complete.py'
- runInstaller(bootstrap_interface_version, remote_nfs, orgName, systime, vds_config_str, url_rpm, vds_server, random_num, vds_script, vds_complete, firewall_rules_file, engine_ssh_key, rebootAfterInstallation, installVirtualizationService, installGlusterService)
+ if not runInstaller(
+ bootstrap_interface_version,
+ remote_nfs,
+ orgName,
+ systime,
+ vds_config_str,
+ url_rpm,
+ vds_server,
+ random_num,
+ vds_script,
+ vds_complete,
+ firewall_rules_file,
+ engine_ssh_key,
+ rebootAfterInstallation,
+ installVirtualizationService,
+ installGlusterService):
+ return False
+
if firewall_rules_file is not None:
try:
os.unlink(firewall_rules_file)
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index cb38ef1..8211c81 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -984,7 +984,7 @@
# rev_num = REVISION
except:
print main.__doc__
- return 0
+ return False
logging.debug('**** Start VDS Validation ****')
try:
@@ -995,7 +995,7 @@
logging.error(main.__doc__)
logging.debug("<BSTRAP component='RHEV_INSTALL' status='FAIL'/>")
print "<BSTRAP component='RHEV_INSTALL' status='FAIL'/>"
- return 0
+ return False
else:
message = ("<BSTRAP component='RHEV_INSTALL' status=")
if ret:
@@ -1008,6 +1008,7 @@
logging.debug('**** End VDS Validation ****')
sys.stdout.flush()
+ return ret
if __name__ == "__main__":
- sys.exit(main())
+ sys.exit(not main())
diff --git a/vds_bootstrap/vds_bootstrap_complete.py b/vds_bootstrap/vds_bootstrap_complete.py
index a333842..7711d82 100755
--- a/vds_bootstrap/vds_bootstrap_complete.py
+++ b/vds_bootstrap/vds_bootstrap_complete.py
@@ -88,7 +88,7 @@
rnum = args[0]
except:
print main.__doc__
- return 0
+ return False
try:
arg = int(args[1])
except:
@@ -119,5 +119,7 @@
print "<BSTRAP component='RHEV_INSTALL' status='FAIL'/>"
sys.stdout.flush()
+ return res
+
if __name__ == "__main__":
- sys.exit(main())
+ sys.exit(not main())
--
To view, visit http://gerrit.ovirt.org/7301
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cf1d2ad402641394da52099c157fc34cf49cad1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: bootstrap: send complete bootstrap from engine
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: send complete bootstrap from engine
......................................................................
bootstrap: send complete bootstrap from engine
CURRENT BEHAVIOR
vds_installer.py is part of ovirt-engine, upon bootstrap, the script is
sent to the node using ssh.
Then vds_installer.py pulls vdsm-bootstrap files using HTTP from engine.
NEW BEHAVIOR
vds_installer.py was moved into the vdsm-bootstrap and renamed to setup.
vdsm-bootstrap repository was updated to create a single tarball with
suitable file names and attributes.
ovirt-engine copies the tarball to node into temporary directory,
extracts it and run setup script.
No HTTP communication is needed.
No conflict with existing files.
Change-Id: I01ddee19cbb65341ed22435ed9e735a0ad3c2abd
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M .gitignore
M vds_bootstrap/Makefile.am
A vds_bootstrap/setup
M vdsm.spec.in
M vdsm_reg/Makefile.am
M vdsm_reg/deployUtil.py.in
6 files changed, 362 insertions(+), 26 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/6962/1
--
To view, visit http://gerrit.ovirt.org/6962
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01ddee19cbb65341ed22435ed9e735a0ad3c2abd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: bootstrap: remove temporary files even if some missing
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: remove temporary files even if some missing
......................................................................
bootstrap: remove temporary files even if some missing
Current code simply skip the whole process if one temporary file is
missing.
We need to remove as much temporary files as possible, so ignore single
file exception.
Change-Id: I7f69af679e798846e15faa0b9674aeeadc6d01e4
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/7302/1
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 5521fed..0f31b27 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -189,33 +189,36 @@
logging.debug("setCoreDumpPath end:" + str(fReturn))
return fReturn
+def _removeNoError(file):
+ try:
+ os.remove(file)
+ except OSError:
+ pass
+
def cleanAll(random_num):
""" Remove temp files.
"""
- fReturn = True
- try:
- for f in (
- '/vds_bootstrap_%s.py' % random_num,
- '/vds_bootstrap_complete_%s.py' % random_num,
- '/deployUtil.py'
- ):
- os.unlink(_WORK_DIR + f)
- os.unlink(_WORK_DIR + f + "c")
- for f in (
- '/req_%s.conf' % random_num,
- '/cert_%s.req' % random_num,
- '/cert_%s.pem' % random_num,
- '/CA_%s.pem' % random_num
- ):
- os.unlink(_WORK_DIR + f)
- except:
- pass
+ for f in (
+ '/vds_bootstrap_%s.py' % random_num,
+ '/vds_bootstrap_complete_%s.py' % random_num,
+ '/deployUtil.py'
+ ):
+ _removeNoError(_WORK_DIR + f)
+ _removeNoError(_WORK_DIR + f + "c")
+
+ for f in (
+ '/req_%s.conf' % random_num,
+ '/cert_%s.req' % random_num,
+ '/cert_%s.pem' % random_num,
+ '/CA_%s.pem' % random_num
+ ):
+ _removeNoError(_WORK_DIR + f)
print "<BSTRAP component='cleanAll' status='OK'/>"
logging.debug("cleanAll end:" + str(fReturn))
- return fReturn
+ return True
def setVdsConf(configStr, confFile):
"""
--
To view, visit http://gerrit.ovirt.org/7302
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f69af679e798846e15faa0b9674aeeadc6d01e4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: vdsm-reg: return proper exit code from upgrade script
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: vdsm-reg: return proper exit code from upgrade script
......................................................................
vdsm-reg: return proper exit code from upgrade script
main returns boolean, while exit code of "True" is actually program
status of failure.
Change-Id: I4d0c3d60c3d80ea50ede6b22f931b091ec625836
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vdsm_reg/vdsm-upgrade
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/7279/1
diff --git a/vdsm_reg/vdsm-upgrade b/vdsm_reg/vdsm-upgrade
index 402ff0f..07d5c1b 100755
--- a/vdsm_reg/vdsm-upgrade
+++ b/vdsm_reg/vdsm-upgrade
@@ -167,5 +167,5 @@
return fOK
if __name__ == "__main__":
- sys.exit(main())
+ sys.exit(not main())
--
To view, visit http://gerrit.ovirt.org/7279
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d0c3d60c3d80ea50ede6b22f931b091ec625836
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months