Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: legacy: use postgres db user ......................................................................
packaging: setup: legacy: use postgres db user Take db user from /etc/sysconfig/ovirt-engine and its credentials from pgpass. Bug-Url: https://bugzilla.redhat.com/1049654 Change-Id: I391cc532fd1673db9f6adb29fc0cce052992fda4 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/legacy/database.py 1 file changed, 28 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/23099/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py index c4d7205..734c344 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/database.py @@ -30,6 +30,9 @@ from otopi import plugin +from ovirt_engine import configfile + + from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import database @@ -55,39 +58,37 @@ osetupcons.FileLocations.LEGACY_PSQL_PASS_FILE ): self.logger.debug('Existing database pgpass found') + config = configfile.ConfigFile([ + osetupcons.FileLocations.LEGACY_OVIRT_ENGINE_SYSCONFIG + ]) + legacy_user = config.get('ENGINE_DB_USER') + self.logger.debug('legacy ENGINE_DB_USER: %s' % legacy_user) with open( osetupcons.FileLocations.LEGACY_PSQL_PASS_FILE, 'r', ) as f: for l in f: l = l.rstrip('\n') - if ':%s:' % 'postgres' not in l: - d = l.split(':') - if len(d) == 5: - self._dbenv = { - osetupcons.DBEnv.HOST: d[0], - osetupcons.DBEnv.PORT: int(d[1]), - osetupcons.DBEnv.SECURED: None, - osetupcons.DBEnv.SECURED_HOST_VALIDATION: None, - osetupcons.DBEnv.DATABASE: ( - d[2] if d[2] != '*' - else - osetupcons.Defaults.DEFAULT_DB_DATABASE - ), - osetupcons.DBEnv.USER: d[3], - osetupcons.DBEnv.PASSWORD: d[4], - osetupcons.DBEnv.NEW_DATABASE: False, - } - self.environment[ - osetupcons.CoreEnv.LEGACY_PG_CREDS_FOUND - ] = True - - # In legacy we always have engine user defined - # before the rhevm user, as that's how we - # upgraded from 3.0; in other installations - # we will not have more than 1 user (engine) - # As such, we should use the first user we find. - break + d = l.split(':') + if len(d) == 5 and d[3] == legacy_user: + self._dbenv = { + osetupcons.DBEnv.HOST: d[0], + osetupcons.DBEnv.PORT: int(d[1]), + osetupcons.DBEnv.SECURED: None, + osetupcons.DBEnv.SECURED_HOST_VALIDATION: None, + osetupcons.DBEnv.DATABASE: ( + d[2] if d[2] != '*' + else + osetupcons.Defaults.DEFAULT_DB_DATABASE + ), + osetupcons.DBEnv.USER: d[3], + osetupcons.DBEnv.PASSWORD: d[4], + osetupcons.DBEnv.NEW_DATABASE: False, + } + self.environment[ + osetupcons.CoreEnv.LEGACY_PG_CREDS_FOUND + ] = True + break @plugin.event( stage=plugin.Stages.STAGE_SETUP, -- To view, visit http://gerrit.ovirt.org/23099 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I391cc532fd1673db9f6adb29fc0cce052992fda4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
