Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: move PGPASS_FILE initialization to proper
place
......................................................................
packaging: setup: move PGPASS_FILE initialization to proper place
Change-Id: I1b153d7f75ead2ef3cb2b88a36e87fe7ea16e8dd
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-common/db/connection.py
M packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/16540/1
diff --git a/packaging/setup/plugins/ovirt-engine-common/db/connection.py
b/packaging/setup/plugins/ovirt-engine-common/db/connection.py
index c132f72..d99544b 100644
--- a/packaging/setup/plugins/ovirt-engine-common/db/connection.py
+++ b/packaging/setup/plugins/ovirt-engine-common/db/connection.py
@@ -77,7 +77,6 @@
self.environment[osetupcons.DBEnv.CONNECTION] = None
self.environment[osetupcons.DBEnv.STATEMENT] = None
self.environment[osetupcons.DBEnv.NEW_DATABASE] = True
- self.environment[osetupcons.DBEnv.PGPASS_FILE] = None
@plugin.event(
stage=plugin.Stages.STAGE_SETUP,
diff --git a/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
b/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
index 7742388..5b344f5 100644
--- a/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
+++ b/packaging/setup/plugins/ovirt-engine-common/db/pgpass.py
@@ -39,6 +39,12 @@
super(Plugin, self).__init__(context=context)
@plugin.event(
+ stage=plugin.Stages.STAGE_INIT,
+ )
+ def _init(self):
+ self.environment[osetupcons.DBEnv.PGPASS_FILE] = None
+
+ @plugin.event(
stage=plugin.Stages.STAGE_MISC,
name=osetupcons.Stages.DB_CREDENTIALS_AVAILABLE,
)
--
To view, visit http://gerrit.ovirt.org/16540
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b153d7f75ead2ef3cb2b88a36e87fe7ea16e8dd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
