Yaniv Dary has uploaded a new change for review. Change subject: packaging: setup: use db creds from answer file ......................................................................
packaging: setup: use db creds from answer file Change-Id: Icac431a840c1207313c5a4b6e47eace93d1dd099 Bug-Url: https://bugzilla.redhat.com/1100281 Signed-off-by: Yedidyah Bar David <[email protected]> (cherry picked from commit 03e30bbb24abbe246b800696e5c75a78f89f5f89) --- M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/08/28008/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 07fb456..41c62d5 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 @@ -112,7 +112,10 @@ odwhcons.FileLocations.OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DEFAULTS, odwhcons.FileLocations.OVIRT_ENGINE_DWHD_SERVICE_CONFIG, ]) - if config.get('DWH_DB_PASSWORD'): + if ( + config.get('DWH_DB_PASSWORD') or + self.environment.get(odwhcons.DBEnv.PASSWORD) + ): try: dbenv = {} for e, k in ( @@ -122,7 +125,7 @@ (odwhcons.DBEnv.PASSWORD, 'DWH_DB_PASSWORD'), (odwhcons.DBEnv.DATABASE, 'DWH_DB_DATABASE'), ): - dbenv[e] = config.get(k) + dbenv[e] = self.environment.get(e, config.get(k)) for e, k in ( (odwhcons.DBEnv.SECURED, 'DWH_DB_SECURED'), ( -- To view, visit http://gerrit.ovirt.org/28008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icac431a840c1207313c5a4b6e47eace93d1dd099 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Yaniv Dary <[email protected]> Gerrit-Reviewer: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
