Alex Lourie has uploaded a new change for review.
Change subject: packaging: setup: Changed stage for temp pgpass
......................................................................
packaging: setup: Changed stage for temp pgpass
Currently temp pgpass file is created in misc stage.
This causes problems for upgrade, when db validations
must be run in validation stage.
The new implementation moves creation of the temp pgpass
file to validation stage, keeping its name and allowing
other validation steps to do work when the file is available.
Change-Id: Ib9fc158a98cfdf36a1b812a4022298dc6e011d05
Signed-off-by: Alex Lourie <alou...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
M packaging/setup/plugins/ovirt-engine-remove/db/clear.py
M packaging/setup/plugins/ovirt-engine-setup/config/database.py
M packaging/setup/plugins/ovirt-engine-setup/db/schema.py
4 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/16466/1
diff --git a/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
b/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
index 7742388..705e209 100644
--- a/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
+++ b/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
@@ -39,7 +39,7 @@
super(Plugin, self).__init__(context=context)
@plugin.event(
- stage=plugin.Stages.STAGE_MISC,
+ stage=plugin.Stages.STAGE_VALIDATION,
name=osetupcons.Stages.DB_CREDENTIALS_AVAILABLE,
)
def _misc(self):
diff --git a/packaging/setup/plugins/ovirt-engine-remove/db/clear.py
b/packaging/setup/plugins/ovirt-engine-remove/db/clear.py
index 6df8a85..1f3a8b9 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/db/clear.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/db/clear.py
@@ -77,9 +77,6 @@
self.environment[osetupcons.DBEnv.PASSWORD] is not None and
self.environment[osetupcons.DBEnv.REMOVE_EMPTY_DATABASE]
),
- after=[
- osetupcons.Stages.DB_CREDENTIALS_AVAILABLE,
- ],
)
def _misc(self):
diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/database.py
b/packaging/setup/plugins/ovirt-engine-setup/config/database.py
index 6d871eb..a81d0d0 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/database.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/database.py
@@ -44,9 +44,6 @@
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
name=osetupcons.Stages.CONFIG_DB_CREDENTIALS,
- after=[
- osetupcons.Stages.DB_CREDENTIALS_AVAILABLE,
- ]
)
def _misc(self):
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
diff --git a/packaging/setup/plugins/ovirt-engine-setup/db/schema.py
b/packaging/setup/plugins/ovirt-engine-setup/db/schema.py
index 7062ab6..c60ba9e 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/db/schema.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/db/schema.py
@@ -139,9 +139,6 @@
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
name=osetupcons.Stages.DB_SCHEMA,
- after=[
- osetupcons.Stages.DB_CREDENTIALS_AVAILABLE,
- ],
condition=lambda self: not self.environment[
osetupcons.DBEnv.NEW_DATABASE
],
--
To view, visit http://gerrit.ovirt.org/16466
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9fc158a98cfdf36a1b812a4022298dc6e011d05
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
