Skip to content
This repository was archived by the owner on Jul 21, 2023. It is now read-only.

Commit c7c2d1e

Browse files
authored
Merge pull request #73 from nyoxi/rhv-check
remove check for oVirt version
2 parents 50c883f + 8782ae3 commit c7c2d1e

File tree

2 files changed

+0
-30
lines changed

2 files changed

+0
-30
lines changed

Diff for: ansible/oVirt.v2v-conversion-host/tasks/install-validate-rhevm.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
---
2-
- name: Validate RHV host -- RHV version requirement
3-
command: /usr/bin/virt-v2v-wrapper.py --check-rhv-version
4-
when: v2v_checks_override is not defined or not v2v_checks_override
5-
changed_when: false
6-
72
- name: Validate RHV host -- RHV Guest Tools
83
command: /usr/bin/virt-v2v-wrapper.py --check-rhv-guest-tools
94
when: v2v_checks_override is not defined or not v2v_checks_override

Diff for: wrapper/checks.py

-25
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
from .hosts import BaseHost
22

33

4-
VDSM_MIN_RHV = '4.2.4' # This has to match VDSM_MIN_VERSION!
5-
VDSM_MIN_VERSION = '4.20.31' # RC4, final
6-
7-
84
def check_rhv_guest_tools():
95
"""
106
Make sure there is ISO domain with at least one ISO with windows drivers.
@@ -16,27 +12,6 @@ def check_rhv_guest_tools():
1612
return ('virtio_win' in data)
1713

1814

19-
def check_rhv_version():
20-
import rpmUtils.transaction
21-
import rpmUtils.miscutils
22-
23-
ts = rpmUtils.transaction.initReadOnlyTransaction()
24-
match = ts.dbMatch('name', 'vdsm')
25-
if len(match) >= 1:
26-
vdsm = match.next()
27-
res = rpmUtils.miscutils.compareEVR(
28-
(vdsm['epoch'], vdsm['version'], None), # Ignore release number
29-
rpmUtils.miscutils.stringToVersion(VDSM_MIN_VERSION))
30-
if res >= 0:
31-
return True
32-
print('Version of VDSM on the host: {}{}'.format(
33-
'' if vdsm['epoch'] is None else '%s:' % vdsm['epoch'],
34-
vdsm['version']))
35-
print('Minimal required oVirt/RHV version is %s' % VDSM_MIN_RHV)
36-
return False
37-
38-
3915
CHECKS = {
4016
'rhv-guest-tools': check_rhv_guest_tools,
41-
'rhv-version': check_rhv_version,
4217
}

0 commit comments

Comments
 (0)