Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: ignore non-working legacy pgpass ......................................................................
packaging: setup: ignore non-working legacy pgpass Bug-Url: https://bugzilla.redhat.com/1022932 Change-Id: Iddad631ff679f3ba2e338c0925e046ff569b587e Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/legacy/database.py 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/21340/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py index 6cc809d..e26094b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py @@ -64,7 +64,7 @@ if ':%s:' % 'postgres' not in l: d = l.split(':') if len(d) == 5: - self.environment.update({ + self._dbenv = { osetupcons.DBEnv.HOST: d[0], osetupcons.DBEnv.PORT: int(d[1]), osetupcons.DBEnv.SECURED: None, @@ -77,14 +77,10 @@ osetupcons.DBEnv.USER: d[3], osetupcons.DBEnv.PASSWORD: d[4], osetupcons.DBEnv.NEW_DATABASE: False, - osetupcons.CoreEnv.LEGACY_PG_CREDS_FOUND: True, - }) + } self.environment[ - otopicons.CoreEnv.LOG_FILTER - ].append( - self.environment[osetupcons.DBEnv.PASSWORD] - ) - break + osetupcons.CoreEnv.LEGACY_PG_CREDS_FOUND + ] = True @plugin.event( stage=plugin.Stages.STAGE_SETUP, @@ -96,6 +92,12 @@ ], ) def _setup(self): + self.environment.update(self._dbenv) + self.environment[ + otopicons.CoreEnv.LOG_FILTER + ].append( + self.environment[osetupcons.DBEnv.PASSWORD] + ) dbovirtutils = database.OvirtUtils(plugin=self) dbovirtutils.tryDatabaseConnect() if dbovirtutils.isNewDatabase(): -- To view, visit http://gerrit.ovirt.org/21340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddad631ff679f3ba2e338c0925e046ff569b587e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
