10:05 a.m.
Dan Kenigsberg has uploaded a new change for review.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
caps: coarse-grain libvirt.rpm may be missing
As of http://gerrit.ovirt.org/15761 we no longer require the legacy
libvirt.rpm to be installed on Fedora, so getCaps should not look for
it.
Without this patch we get an annoying
(_getKeyPackages) rpm package libvirt not found
log message, and do not report libvirt's version.
Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/caps.py
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/19295/1
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 3a7a6a2..ceea429 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -331,6 +331,9 @@
'mom': 'mom',
}
+ if getos() in (OSName.OVIRT, OSName.FEDORA):
+ KEY_PACKAGES['libvirt-daemon-kvm']
+
if _glusterEnabled:
KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
12:50 p.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
caps: coarse-grain libvirt.rpm may be missing
As of http://gerrit.ovirt.org/15761 we no longer require the legacy
libvirt.rpm to be installed on Fedora, so getCaps should not look for
it. Instead, it should report the information of the installed
libvirt-daemon-kvm.rpm.
Without this patch we get an annoying
(_getKeyPackages) rpm package libvirt not found
log message, and do not report libvirt's version.
Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/19295
Reviewed-by: mooli tayer <mtayer(a)redhat.com>
Reviewed-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm/caps.py
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Douglas Schilling Landgraf: Looks good to me, but someone else must approve
mooli tayer: Looks good to me, but someone else must approve
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
9:30 a.m.
Douglas Schilling Landgraf has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9:18 a.m.
mooli tayer has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
7:51 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 3: Verified+1
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
7:01 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4643/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4565/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3758/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4642/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3757/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4566/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
8:18 a.m.
Douglas Schilling Landgraf has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
....................................................
File vdsm/caps.py
Line 332: }
Line 333:
Line 334: if getos() in (OSName.OVIRT, OSName.FEDORA):
Line 335: KEY_PACKAGES['libvirt'] = 'libvirt-daemon-kvm'
Line 336:
oh yes, RHEL7 will have libvirt-daemon-kvm.
Line 337: if _glusterEnabled:
Line 338: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
Line 339:
Line 340: try:
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
7:35 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
....................................................
File vdsm/caps.py
Line 332: }
Line 333:
Line 334: if getos() in (OSName.OVIRT, OSName.FEDORA):
Line 335: KEY_PACKAGES['libvirt'] = 'libvirt-daemon-kvm'
Line 336:
no, it returns 'libvirt-daemon-kvm' only for Fedora, where all supported versions
have such a package.
However, you ARE correct about EL7, which would have 'libvirt-daemon-kvm' too.
Use your -1 force, Mooli!
Line 337: if _glusterEnabled:
Line 338: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
Line 339:
Line 340: try:
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
5:29 a.m.
mooli tayer has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2:
(1 comment)
....................................................
File vdsm/caps.py
Line 332: }
Line 333:
Line 334: if getos() in (OSName.OVIRT, OSName.FEDORA):
Line 335: KEY_PACKAGES['libvirt'] = 'libvirt-daemon-kvm'
Line 336:
According to http://gerrit.ovirt.org/#/c/15761/3
on RHEL < 7 and fedora < 18 the libvirt package is still 'libvirt'.
This code always returns 'libvirt-daemon-kvm'.
is that on purpose?
Line 337: if _glusterEnabled:
Line 338: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
Line 339:
Line 340: try:
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
12:48 p.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4587/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4509/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3702/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
12:48 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2: Verified+1
in patchset1 I was plainly lazy. both in writing the two-liner and in not verifying it.
Sorry for your lost time.
now
vdsClient -s 0 getVdsCaps |grep -A2 libvirt
has
'libvirt': {'buildtime': 1375400611,
'release': '1.fc19',
'version': '1.0.5.5'},
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9:50 a.m.
mooli tayer has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 1:
(1 comment)
....................................................
File vdsm/caps.py
Line 331: 'mom': 'mom',
Line 332: }
Line 333:
Line 334: if getos() in (OSName.OVIRT, OSName.FEDORA):
Line 335: KEY_PACKAGES['libvirt-daemon-kvm']
Maybe it was meant to be:
del KEY_PACKAGES['libvirt']?
Line 336:
Line 337: if _glusterEnabled:
Line 338: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
Line 339:
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
5:13 a.m.
Yaniv Bronhaim has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 1:
(1 comment)
....................................................
File vdsm/caps.py
Line 331: 'mom': 'mom',
Line 332: }
Line 333:
Line 334: if getos() in (OSName.OVIRT, OSName.FEDORA):
Line 335: KEY_PACKAGES['libvirt-daemon-kvm']
doesn't it throw a KeyError here? shouldn't it be:
KEY_PACKAGES['libvirt'] = 'libvirt-daemon-kvm' ?
or removing 'libvirt' key at all, maybe i missed the meaning here.. it will still
search for libvirt.rpm that way
Line 336:
Line 337: if _glusterEnabled:
Line 338: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
Line 339:
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
10:16 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4484/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4403/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3587/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
12:50 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 3: Code-Review+2
Thanks for the reviews.
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
5:40 p.m.
Douglas Schilling Landgraf has posted comments on this change.
Change subject: caps: coarse-grain libvirt.rpm may be missing
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/19295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I733a1a2411c910caa030e435c2a7f751a8e4dad4
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
3913
days inactive
3935
days old
vdsm-patches@lists.fedorahosted.org
15 comments
5 participants
participants (5)
-
Dan Kenigsberg -
Douglas Schilling Landgraf -
Jenkins CI RO -
mtayer＠redhat.com -
ybronhei＠redhat.com