Hello Alex Lourie,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18524
to review the following change.
Change subject: packaging: setup: copy virtio files if they exist
......................................................................
packaging: setup: copy virtio files if they exist
Current implementation didn't load the image_upload
plugin correctly. Additionally, the plugin itself
checked its own relevance before NFS export was created.
New implementation loads the plugin correctly and moves
NFS check to the validation stage, where NFS creation/export
configuration step already have passed.
Change-Id: Ie35c5a3ad38b2f7bdae88c1f8d0790d1a8c988c2
Signed-off-by: Alex Lourie <alou...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/distro-rpm/__init__.py
M packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/18524/1
diff --git a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/__init__.py
b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/__init__.py
index 49b4be4..61b7e5f 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/__init__.py
@@ -23,11 +23,13 @@
from otopi import util
from . import packages
+from . import image_upload
@util.export
def createPlugins(context):
packages.Plugin(context=context)
+ image_upload.Plugin(context=context)
# vim: expandtab tabstop=4 shiftwidth=4
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py
b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py
index 4130691..517072f 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/distro-rpm/image_upload.py
@@ -67,9 +67,9 @@
]
@plugin.event(
- stage=plugin.Stages.STAGE_SETUP,
+ stage=plugin.Stages.STAGE_VALIDATION,
)
- def _setup(self):
+ def _validation(self):
if not self.environment[osetupcons.CoreEnv.DEVELOPER_MODE]:
if self.environment[osetupcons.SystemEnv.NFS_CONFIG_ENABLED]:
for filename in self._fileList:
--
To view, visit http://gerrit.ovirt.org/18524
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie35c5a3ad38b2f7bdae88c1f8d0790d1a8c988c2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
