Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: setup: refactored cpu validation
......................................................................
packaging: setup: refactored cpu validation
refactored cpu validation in all-in-one/cpu plugin after
recent changes in ovirt-host-deploy.
Change-Id: Id8d001789d63e9dbe4761541bbe761e5e6768de5
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/all-in-one/cpu.py
2 files changed, 10 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/15085/1
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index 80e72b3..b6c7c63 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -336,13 +336,6 @@
DATADIR,
'vdsm',
)
- AIO_HOST_DEPLOY_VDSM_PATH = os.path.join(
- DATADIR,
- 'ovirt-host-deploy',
- 'plugins',
- 'ovirt-host-deploy',
- 'vdsm'
- )
AIO_STORAGE_DOMAIN_DEFAULT_DIR = os.path.join(
LOCALSTATEDIR,
'lib',
diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/cpu.py
b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/cpu.py
index f94ab2b..6ae5fb7 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/cpu.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/cpu.py
@@ -27,6 +27,7 @@
from otopi import util
from otopi import plugin
+from ovirt_host_deploy import hardware
from ovirt_engine_setup import constants as osetupcons
@@ -103,19 +104,9 @@
priority=plugin.Stages.PRIORITY_HIGH,
)
def _setup(self):
- supported = False
- try:
- hardware = util.loadModule(
- path=osetupcons.FileLocations.AIO_HOST_DEPLOY_VDSM_PATH,
- name='hardware'
- ).Plugin(context=self.context)
- hardware._validate_virtualization()
- supported = True
- except ImportError:
- self.logger.debug("Can't validate virtualization support")
- except Exception as e:
- self.logger.warning(e)
- if not supported:
+ virtualization = hardware.Virtualization()
+ result = virtualization.detect()
+ if result == virtualization.DETECT_RESULT_UNSUPPORTED:
self.logger.warning(
_(
'Disabling all-in-one plugin because hardware '
@@ -123,6 +114,12 @@
)
)
self.environment[osetupcons.AIOEnv.ENABLE] = False
+ elif result == virtualization.DETECT_RESULT_SUPPORTED:
+ self.logger.info(_('Hardware supports virtualization'))
+ else:
+ self.logger.warning(
+ _('Cannot detect if hardware supports virtualization')
+ )
@plugin.event(
stage=plugin.Stages.STAGE_VALIDATION,
--
To view, visit http://gerrit.ovirt.org/15085
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d001789d63e9dbe4761541bbe761e5e6768de5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
