Change in vdsm[master]: vdsm-reg: use web server CA extracted from SSL handshake
by Alon Bar-Lev
Alon Bar-Lev has posted comments on this change.
Change subject: vdsm-reg: use web server CA extracted from SSL handshake
......................................................................
Patch Set 2:
No... unless I am doing something terribly wrong, the certificate we extract is of the CA (max(depth)).
--
To view, visit http://gerrit.ovirt.org/8386
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iab8727a167de19ac66712309868654ae00c9bf4d
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: vdsm-reg: use web server CA extracted from SSL handshake
by juan.hernandez＠redhat.com
Juan Hernandez has posted comments on this change.
Change subject: vdsm-reg: use web server CA extracted from SSL handshake
......................................................................
Patch Set 2:
But, if I understood correctly, the hash that the user approves is the hash of the web server certificate, not the hash of the CA certificate. I may be wrong, please correct me if that is the case.
--
To view, visit http://gerrit.ovirt.org/8386
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iab8727a167de19ac66712309868654ae00c9bf4d
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: vdsm-reg: use web server CA extracted from SSL handshake
by Alon Bar-Lev
Alon Bar-Lev has posted comments on this change.
Change subject: vdsm-reg: use web server CA extracted from SSL handshake
......................................................................
Patch Set 1: (6 inline comments)
> I also have to say that I don't really see the benefit (from the security point of view) of downloading the CA certificate and then using it to check latter HTTPS connections. As we don't do any verification on the CA certificate we could well ignore the CA certificate, right?
No. If user approves the certificate hash one time, this CA becomes the trust anchor for future operations.
....................................................
File vdsm_reg/deployUtil.py.in
Line 1529: if os.path.exists(engineWebCACert):
Line 1530: ovirtfunctions.ovirt_safe_delete_config(engineWebCACert)
Line 1531:
Line 1532: def getChainFromSSL(host):
Line 1533: chain = {}
Done
Line 1534:
Line 1535: def _getChainFromSSL_Verify(conn, cert, errnum, depth, ok):
Line 1536: chain[depth] = OpenSSL.crypto.dump_certificate(
Line 1537: OpenSSL.crypto.FILETYPE_PEM,
Line 1531:
Line 1532: def getChainFromSSL(host):
Line 1533: chain = {}
Line 1534:
Line 1535: def _getChainFromSSL_Verify(conn, cert, errnum, depth, ok):
Done
Line 1536: chain[depth] = OpenSSL.crypto.dump_certificate(
Line 1537: OpenSSL.crypto.FILETYPE_PEM,
Line 1538: cert
Line 1539: ).decode("utf-8")
Line 1535: def _getChainFromSSL_Verify(conn, cert, errnum, depth, ok):
Line 1536: chain[depth] = OpenSSL.crypto.dump_certificate(
Line 1537: OpenSSL.crypto.FILETYPE_PEM,
Line 1538: cert
Line 1539: ).decode("utf-8")
These are not separate objects embedded this time. I prefer it this way.
Line 1540: return True
Line 1541:
Line 1542: ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
Line 1543: ctx.set_verify(OpenSSL.SSL.VERIFY_PEER, _getChainFromSSL_Verify)
Line 1540: return True
Line 1541:
Line 1542: ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
Line 1543: ctx.set_verify(OpenSSL.SSL.VERIFY_PEER, _getChainFromSSL_Verify)
Line 1544: ctx.set_verify_depth(10)
Done
Line 1545: sock = OpenSSL.SSL.Connection(
Line 1546: ctx,
Line 1547: socket.socket(socket.AF_INET, socket.SOCK_STREAM)
Line 1548: )
Line 1544: ctx.set_verify_depth(10)
Line 1545: sock = OpenSSL.SSL.Connection(
Line 1546: ctx,
Line 1547: socket.socket(socket.AF_INET, socket.SOCK_STREAM)
Line 1548: )
Because it is not used in any statement and it wrapped.
There is no reason to make code more complex and be creating in inventing temporary variable names just for the sake of variable... it does not make code simpler, it just make it more complex.
Line 1549: sock.connect(host)
Line 1550: sock.do_handshake()
Line 1551: sock.shutdown()
Line 1552: sock.close()
Line 1550: sock.do_handshake()
Line 1551: sock.shutdown()
Line 1552: sock.close()
Line 1553:
Line 1554: # elimintate duplicates
Done
Line 1555: return [chain[depth] for depth in sorted(chain.keys())]
Line 1556:
Line 1557: def getRhevmCert(IP, port):
Line 1558: """Aquire CA certificate from SSL handshake
--
To view, visit http://gerrit.ovirt.org/8386
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iab8727a167de19ac66712309868654ae00c9bf4d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: [WIP] BZ#855922, fix attribute error during migration
by peet＠redhat.com
Peter V. Saveliev has uploaded a new change for review.
Change subject: [WIP] BZ#855922, fix attribute error during migration
......................................................................
[WIP] BZ#855922, fix attribute error during migration
way 1: make the blockDev property read-write, not read-only
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Change-Id: I81e7c9a74d19c679c4e11c63b4cf854a9d19c26c
---
M vdsm/libvirtvm.py
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/8185/1
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 7bc68b2..5af86e3 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1016,14 +1016,13 @@
self.name = self._makeName()
if self.device in ("cdrom", "floppy"):
- self._blockDev = False
+ self.blockDev = False
else:
- self._blockDev = None
+ self.blockDev = None
self._customize()
- @property
- def blockDev(self):
+ def _get_blockDev(self):
if self._blockDev is None:
try:
self._blockDev = utils.isBlockDevice(self.path)
@@ -1032,6 +1031,11 @@
"block device", self.path, exc_info=True)
return self._blockDev
+ def _set_blockDev(self, value):
+ self._blockDev = value
+
+ blockDev = property(_get_blockDev, _set_blockDev)
+
def _customize(self):
# Customize disk device
if self.iface == 'virtio':
--
To view, visit http://gerrit.ovirt.org/8185
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81e7c9a74d19c679c4e11c63b4cf854a9d19c26c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: Add support for KVM on IBM POWER processor (ppc64)
by Pradipta Kumar Banerjee
Pradipta Banerjee has uploaded a new change for review.
Change subject: Add support for KVM on IBM POWER processor (ppc64)
......................................................................
Add support for KVM on IBM POWER processor (ppc64)
This patchset adds ppc64 arch support to the bootstrap code.
Changes have been made to enable detection of CPU vendor,
virtualization capability of the POWER platform and getting
system UUID for KVM on POWER
Change-Id: I2d8767c52488ab8083123d0ec1e789d3857e2358
Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com>
---
M vds_bootstrap/vds_bootstrap.py
M vdsm.spec.in
M vdsm_reg/deployUtil.py.in
3 files changed, 62 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/8094/1
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 5c8cf84..f74a853 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -295,8 +295,14 @@
if "GenuineIntel" == deployUtil.cpuVendorID():
self.res = "Intel"
- else:
- self.res = "AMD"
+ elif "AuthenticAMD" == deployUtil.cpuVendorID():
+ self.res = "AMD"
+ elif "IBM_POWER" == deployUtil.cpuVendorID():
+ self.res = "IBM"
+ else:
+ self.res = "Unknown"
+ logging.error("Unable to get CPU Vendor ID")
+
if self.vt_svm is None:
self.vt_svm = "NA"
diff --git a/vdsm.spec.in b/vdsm.spec.in
index ca678da..3a854de 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -61,9 +61,13 @@
Requires: iproute
Requires: python-ethtool
Requires: rpm-python
-Requires: nfs-utils dmidecode
+Requires: nfs-utils
Requires: lvm2 >= 2.02.95
+%ifarch x86_64
+Requires: dmidecode
+%endif
+
%if 0%{?rhel}
Requires: python
# Update the qemu-kvm requires when block_stream will be included
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index bbda70e..6f22cb6 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -313,13 +313,22 @@
This function parses the DMI data for the host's UUID. If not found, returns "None".
"""
strReturn = "None"
+ if getPlatformArch() == 'x86_64':
+ out, err, ret = _logExec([EX_DMIDECODE, "-s", "system-uuid"])
+ out = '\n'.join( line for line in out.splitlines()
+ if not line.startswith('#') )
- out, err, ret = _logExec([EX_DMIDECODE, "-s", "system-uuid"])
- out = '\n'.join( line for line in out.splitlines()
- if not line.startswith('#') )
-
- if ret == 0 and "Not" not in out: #Avoid error string- 'Not Settable' or 'Not Present'
- strReturn = out.replace ("\n", "")
+ # Avoid error string- 'Not Settable' or 'Not Present'
+ if ret == 0 and "Not" not in out:
+ strReturn = out.replace ("\n", "")
+ else:
+ logging.error("getMachineUUID: Could not find machine's UUID.")
+ elif getPlatformArch() == "ppc64":
+ if os.path.exists('/proc/device-tree/system-id'):
+ #eg. output IBM,03061C14A
+ strReturn = file('/proc/device-tree/system-id').readline().replace(",","")
+ else:
+ logging.error("getMachineUUID: Could not find machine's UUID.")
else:
logging.error("getMachineUUID: Could not find machine's UUID.")
@@ -450,6 +459,19 @@
osVer = platform.linux_distribution(distname='', version='Unknown OS')
logging.debug("OS Release Ver = %s", osVer[1])
return osVer[1]
+
+
+def getPlatformArch():
+ """
+ Return the Platform Arch - x86_64, ppc64 etc
+
+ Return '' on any failure.
+ """
+
+ platformArch = platform.machine()
+ logging.debug("Platform Arch = %s", platformArch)
+ return platformArch
+
def getKernelVR():
"""Return current kernel version and release."""
@@ -1348,17 +1370,33 @@
return 0
return 1
+
+def _check_kvm_support_on_power():
+ for line in file('/proc/cpuinfo').readlines():
+ if ':' in line:
+ k, v = line.split(':', 1)
+ k = k.strip()
+ v = v.strip()
+ if k == 'platform':
+ if 'powernv' in v.lower():
+ return 1
+
+ return 0
+
+
def cpuVendorID():
for line in file('/proc/cpuinfo').readlines():
if ':' in line:
k, v = line.split(':', 1)
k = k.strip()
v = v.strip()
- if k == 'vendor_id':
+ if k == 'vendor_id' or k == 'cpu':
if v == 'GenuineIntel':
return v
elif v == 'AuthenticAMD':
return v
+ elif 'power' in v.lower():
+ return 'IBM_POWER'
return ''
def virtEnabledInCpuAndBios():
@@ -1372,6 +1410,10 @@
elif vendor == 'AuthenticAMD':
bios_en = _svm_enabled_by_bios();
has_cpu = _cpu_has_svm_support();
+ elif vendor == 'IBM_POWER':
+ if _check_kvm_support_on_power():
+ bios_en = 1;
+ has_cpu = 1;
else:
return False
--
To view, visit http://gerrit.ovirt.org/8094
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8767c52488ab8083123d0ec1e789d3857e2358
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Pradipta Banerjee <bpradip(a)in.ibm.com>
11 years, 7 months
Change in vdsm[master]: storage: Default to NFSv3 if version not specified
by gpadgett＠redhat.com
Greg Padgett has uploaded a new change for review.
Change subject: storage: Default to NFSv3 if version not specified
......................................................................
storage: Default to NFSv3 if version not specified
Unexpectedly switching to NFSv4 during e.g. upgrades from 3.0 to 3.1
can cause permissions issues. Unless explicitly set, use v3 as the
default. (By default, engine doesn't pass a version for SPs with
compatibility version 2.2 or 3.0.)
Bug-Url: https://bugzilla.redhat.com/855729
Change-Id: I83307ecd8262688f3d4ddb43b62a79924ecfc62c
Signed-off-by: Greg Padgett <gpadgett(a)redhat.com>
---
M vdsm/storage/storageServer.py
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/8241/1
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index a7dda01..148d446 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -229,9 +229,9 @@
@property
def version(self):
- if self._version is not None:
+ if self._version != 'auto':
return self._version
-
+
# Version was not specified but if we are connected we can figure out
# the negotiated version
mnt = self._mountCon.getMountObj()
@@ -249,16 +249,15 @@
return -1
- def __init__(self, export, timeout=600, retrans=6, version=None):
+ def __init__(self, export, timeout=600, retrans=6, version=3):
self._remotePath = normpath(export)
- self._version = version
options = self.DEFAULT_OPTIONS[:]
self._timeout = timeout
self._version = version
self._retrans = retrans
_addIntegerOption(options, "timeo", timeout)
_addIntegerOption(options, "retrans", retrans)
- if version:
+ if version != 'auto':
_addIntegerOption(options, "vers", version)
self._mountCon = MountConnection(export, "nfs", ",".join(options))
--
To view, visit http://gerrit.ovirt.org/8241
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83307ecd8262688f3d4ddb43b62a79924ecfc62c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com>
11 years, 7 months
Change in vdsm[ovirt-3.1]: Use buffer size in multiplies of the recommended transfer si...
by Federico Simoncelli
Hello Jason Brooks, Saggi Mizrahi, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/8369
to review the following change.
Change subject: Use buffer size in multiplies of the recommended transfer size
......................................................................
Use buffer size in multiplies of the recommended transfer size
Using the recommended transfer size fixes the memory corruption for NFS.
Bug-Id: http://bugzilla.redhat.com/845660
Change-Id: Iadea310039b30073197b7ad90afb930c460bda17
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/8356
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Tested-by: Jason Brooks <jbrooks(a)redhat.com>
---
M vdsm/storage/fileUtils.py
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/8369/1
diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py
index 511dff9..ccc2bfe 100644
--- a/vdsm/storage/fileUtils.py
+++ b/vdsm/storage/fileUtils.py
@@ -48,6 +48,7 @@
CharPointer = ctypes.POINTER(ctypes.c_char)
_PC_REC_XFER_ALIGN = 17
+_PC_REC_MIN_XFER_SIZE = 16
class TarCopyFailed(RuntimeError): pass
@@ -265,6 +266,13 @@
# Because we usually have fixed sizes for our reads, caching
# buffers might give a slight performance boost.
alignment = libc.fpathconf(self.fileno(), _PC_REC_XFER_ALIGN)
+ minXferSize = libc.fpathconf(self.fileno(), _PC_REC_MIN_XFER_SIZE)
+ chunks, remainder = divmod(size, minXferSize)
+ if remainder > 0:
+ chunks += 1
+
+ size = chunks * minXferSize
+
rc = libc.posix_memalign(ppbuff, alignment, size)
if rc:
raise OSError(rc, "Could not allocate aligned buffer")
--
To view, visit http://gerrit.ovirt.org/8369
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadea310039b30073197b7ad90afb930c460bda17
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.1
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jason Brooks <jbrooks(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: Use buffer size in multiplies of the recommended transfer si...
by smizrahi＠redhat.com
Saggi Mizrahi has uploaded a new change for review.
Change subject: Use buffer size in multiplies of the recommended transfer size
......................................................................
Use buffer size in multiplies of the recommended transfer size
This seems to fix the issue but I'm not sure if it's the best possible
solution. Might help get things rolling until we get this nailed down.
Change-Id: Iadea310039b30073197b7ad90afb930c460bda17
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M vdsm/storage/fileUtils.py
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/8356/1
diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py
index 80c45e9..2719d91 100644
--- a/vdsm/storage/fileUtils.py
+++ b/vdsm/storage/fileUtils.py
@@ -31,6 +31,7 @@
import ctypes
from contextlib import contextmanager
import subprocess
+import math
import shutil
from vdsm import constants
@@ -47,6 +48,7 @@
CharPointer = ctypes.POINTER(ctypes.c_char)
_PC_REC_XFER_ALIGN = 17
+_PC_REC_MIN_XFER_SIZE = 16
class TarCopyFailed(RuntimeError):
@@ -296,6 +298,8 @@
# Because we usually have fixed sizes for our reads, caching
# buffers might give a slight performance boost.
alignment = libc.fpathconf(self.fileno(), _PC_REC_XFER_ALIGN)
+ minXferSize = libc.fpathconf(self.fileno(), _PC_REC_MIN_XFER_SIZE)
+ size = int(math.ceil(size / float(minXferSize))) * minXferSize
rc = libc.posix_memalign(ppbuff, alignment, size)
if rc:
raise OSError(rc, "Could not allocate aligned buffer")
--
To view, visit http://gerrit.ovirt.org/8356
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadea310039b30073197b7ad90afb930c460bda17
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: Hook: Cisco VM-FEX support vdsm hooks
by dyasny＠redhat.com
Dan Yasny has uploaded a new change for review.
Change subject: Hook: Cisco VM-FEX support vdsm hooks
......................................................................
Hook: Cisco VM-FEX support vdsm hooks
Cleaned up extra whitespaces
Change-Id: Ief1807a988f190b76298bc4f097a4f52882b2b0f
Signed-off-by: Dan Yasny <dyasny(a)gmail.com>
---
M vdsm_hooks/vmfex/Makefile.am
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/8328/1
diff --git a/vdsm_hooks/vmfex/Makefile.am b/vdsm_hooks/vmfex/Makefile.am
index b5f7e2b..4b18cfe 100644
--- a/vdsm_hooks/vmfex/Makefile.am
+++ b/vdsm_hooks/vmfex/Makefile.am
@@ -33,4 +33,3 @@
uninstall-local:
$(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_vmfex
$(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_migrate_destination/50_vmfex
-
--
To view, visit http://gerrit.ovirt.org/8328
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief1807a988f190b76298bc4f097a4f52882b2b0f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Yasny <dyasny(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: setNetworking(): set bridge status
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: setNetworking(): set bridge status
......................................................................
setNetworking(): set bridge status
Currently, if the bridge for some reason is not created, users are informed
with a warning message and bootstrap continues, the host is rebooted and
Engine will report the node as Non Responsive.
This patch will stop bootstrap as soon as any error occurs adding brigde
and will show to users the an error message like:
"Failed to install Host X.Y.Z. Step: SetNetworking:
Details: addNetwork error trying to add mangament bridge."
Change-Id: I9a24cc1ebd92669faeab8d189aac6ab46a762130
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=840300
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vds_bootstrap/vds_bootstrap.py
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/8345/1
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 0caa5e9..601b00d 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -765,9 +765,7 @@
def setNetworking(self, iurl):
"""
Create management bridge.
- This class will try to create a management bridge named "rehvm". Class
- always succeeds to allow network configuration from managment server
- even in case this class will fail to set the management bridge.
+ This class will try to create a management bridge.
Note: expected input format: http://www.redhat.com/a/b/c or: ftp://10.0.0.23/d/e/f
"""
self.status = "OK"
@@ -786,10 +784,11 @@
self.message = "Failed to parse manager URL!"
self.status = "FAIL"
logging.error(self.message)
- #Do not set rc to allow changes from rhev-m.
+ #Do not set rc to allow changes from Engine
else:
if not self._addNetwork(url, port):
- self.status = "WARN"
+ self.status = "FAIL"
+ self.rc = False
self._xmlOutput('SetNetworking', self.status, None, None, self.message)
return self.rc
--
To view, visit http://gerrit.ovirt.org/8345
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a24cc1ebd92669faeab8d189aac6ab46a762130
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 7 months
