Martin Peřina has uploaded a new change for review. Change subject: kdump: Fix kexec-tools dependency for RHEL 7 ......................................................................
kdump: Fix kexec-tools dependency for RHEL 7 Fixes kexec-tools package dependency for RHEL 7. kexec-tools 2.0.4-32 is part of RHEL 7.0, but it doesn't contain support for fence_kdump config. kexec-tools 2.0.4-33, which contains support for fence_kdump config, will be part of RHEL 7.1. Change-Id: Id898ba2ef1f4ab38253892e78e83443e8bf36eac Bug-Url: https://bugzilla.redhat.com/1079821 Signed-off-by: Martin Perina <[email protected]> --- M ovirt-host-deploy-offline.spec.in M src/plugins/ovirt-host-deploy/core/offlinepackager.py M src/plugins/ovirt-host-deploy/kdump/packages.py 3 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/47/29047/1 diff --git a/ovirt-host-deploy-offline.spec.in b/ovirt-host-deploy-offline.spec.in index 08fe2fb..29e001a 100644 --- a/ovirt-host-deploy-offline.spec.in +++ b/ovirt-host-deploy-offline.spec.in @@ -46,8 +46,13 @@ %endif %endif %if 0%{?rhel} +%if %{rhel} == 6 Requires: kexec-tools >= 2.0.0-274 %endif +%if %{rhel} == 7 +Requires: kexec-tools >= 2.0.4-33 +%endif +%endif %description Host deployment tool for oVirt project. diff --git a/src/plugins/ovirt-host-deploy/core/offlinepackager.py b/src/plugins/ovirt-host-deploy/core/offlinepackager.py index 9dc6ef0..2f3ab93 100644 --- a/src/plugins/ovirt-host-deploy/core/offlinepackager.py +++ b/src/plugins/ovirt-host-deploy/core/offlinepackager.py @@ -82,7 +82,7 @@ if ( ( name in ('redhat', 'centos') and - major_version == 6 + major_version >= 6 ) or ( name == 'fedora' and major_version >= 20 diff --git a/src/plugins/ovirt-host-deploy/kdump/packages.py b/src/plugins/ovirt-host-deploy/kdump/packages.py index 22abd38..ac162b4 100644 --- a/src/plugins/ovirt-host-deploy/kdump/packages.py +++ b/src/plugins/ovirt-host-deploy/kdump/packages.py @@ -87,8 +87,11 @@ min_version = None if name in ('redhat', 'centos'): - if version.split('.')[0] == '6': + major = version.split('.')[0] + if major == '6': min_version = '2.0.0-274' + elif major == '7': + min_version = '2.0.4-33' elif name == 'fedora': min_version = '2.0.4-27' -- To view, visit http://gerrit.ovirt.org/29047 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id898ba2ef1f4ab38253892e78e83443e8bf36eac Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
