Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: use db creds from env if not None ......................................................................
packaging: setup: use db creds from env if not None Fixes Icac431a840c1207313c5a4b6e47eace93d1dd099 - without this engine-cleanup fails. Change-Id: Ib0c55faeb8ffef8823b29016617aa56d2f54ae9c Related-To: https://bugzilla.redhat.com/1094016 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/05/28105/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py index 41c62d5..c4d9965 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py @@ -125,7 +125,10 @@ (odwhcons.DBEnv.PASSWORD, 'DWH_DB_PASSWORD'), (odwhcons.DBEnv.DATABASE, 'DWH_DB_DATABASE'), ): - dbenv[e] = self.environment.get(e, config.get(k)) + dbenv[e] = ( + self.environment.get(e) if self.environment.get(e) is not None + else config.get(k) + ) for e, k in ( (odwhcons.DBEnv.SECURED, 'DWH_DB_SECURED'), ( -- To view, visit http://gerrit.ovirt.org/28105 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0c55faeb8ffef8823b29016617aa56d2f54ae9c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
