Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: allow tuning dump/restore ......................................................................
packaging: setup: allow tuning dump/restore Adapt to the engine's recent changes: I271b1c7c3682a3d0bcc69ae6ea6c9e717ed029d1 I99de636d4da15a253f2186084902f0f133603f4d Change-Id: I6a07e5fef2f8aea6310047eb5210ad5d36be653a Related-To: https://bugzilla.redhat.com/1188132 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/dwh/constants.py 1 file changed, 77 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/02/39502/1 diff --git a/packaging/setup/ovirt_engine_setup/dwh/constants.py b/packaging/setup/ovirt_engine_setup/dwh/constants.py index ecf2c35..0e908c8 100644 --- a/packaging/setup/ovirt_engine_setup/dwh/constants.py +++ b/packaging/setup/ovirt_engine_setup/dwh/constants.py @@ -34,6 +34,8 @@ from . import config +DEK = oengcommcons.DBEnvKeysConst + @util.export @util.codegen @@ -54,43 +56,52 @@ @classproperty def DWH_DB_ENV_KEYS(self): return { - 'host': DBEnv.HOST, - 'port': DBEnv.PORT, - 'secured': DBEnv.SECURED, - 'hostValidation': DBEnv.SECURED_HOST_VALIDATION, - 'user': DBEnv.USER, - 'password': DBEnv.PASSWORD, - 'database': DBEnv.DATABASE, - 'connection': DBEnv.CONNECTION, - 'pgpassfile': DBEnv.PGPASS_FILE, - 'newDatabase': DBEnv.NEW_DATABASE, + DEK.HOST: DBEnv.HOST, + DEK.PORT: DBEnv.PORT, + DEK.SECURED: DBEnv.SECURED, + DEK.HOST_VALIDATION: DBEnv.SECURED_HOST_VALIDATION, + DEK.USER: DBEnv.USER, + DEK.PASSWORD: DBEnv.PASSWORD, + DEK.DATABASE: DBEnv.DATABASE, + DEK.CONNECTION: DBEnv.CONNECTION, + DEK.PGPASSFILE: DBEnv.PGPASS_FILE, + DEK.NEW_DATABASE: DBEnv.NEW_DATABASE, + DEK.DUMPER: DBEnv.DUMPER, + DEK.FILTER: DBEnv.FILTER, + DEK.RESTORE_JOBS: DBEnv.RESTORE_JOBS, } @classproperty def DEFAULT_DWH_DB_ENV_KEYS(self): return { - 'host': Defaults.DEFAULT_DB_HOST, - 'port': Defaults.DEFAULT_DB_PORT, - 'secured': Defaults.DEFAULT_DB_SECURED, - 'hostValidation': Defaults.DEFAULT_DB_SECURED_HOST_VALIDATION, - 'user': Defaults.DEFAULT_DB_USER, - 'password': Defaults.DEFAULT_DB_PASSWORD, - 'database': Defaults.DEFAULT_DB_DATABASE, + DEK.HOST: Defaults.DEFAULT_DB_HOST, + DEK.PORT: Defaults.DEFAULT_DB_PORT, + DEK.SECURED: Defaults.DEFAULT_DB_SECURED, + DEK.HOST_VALIDATION: Defaults.DEFAULT_DB_SECURED_HOST_VALIDATION, + DEK.DEK.USER: Defaults.DEFAULT_DB_USER, + DEK.PASSWORD: Defaults.DEFAULT_DB_PASSWORD, + DEK.DATABASE: Defaults.DEFAULT_DB_DATABASE, + DEK.DUMPER: Defaults.DEFAULT_DB_DUMPER, + DEK.FILTER: Defaults.DEFAULT_DB_FILTER, + DEK.RESTORE_JOBS: Defaults.DEFAULT_DB_RESTORE_JOBS, } @classproperty def ENGINE_DB_ENV_KEYS(self): return { - 'host': EngineDBEnv.HOST, - 'port': EngineDBEnv.PORT, - 'secured': EngineDBEnv.SECURED, - 'hostValidation': EngineDBEnv.SECURED_HOST_VALIDATION, - 'user': EngineDBEnv.USER, - 'password': EngineDBEnv.PASSWORD, - 'database': EngineDBEnv.DATABASE, - 'connection': EngineDBEnv.CONNECTION, - 'pgpassfile': EngineDBEnv.PGPASS_FILE, - 'newDatabase': EngineDBEnv.NEW_DATABASE, + DEK.HOST: EngineDBEnv.HOST, + DEK.PORT: EngineDBEnv.PORT, + DEK.SECURED: EngineDBEnv.SECURED, + DEK.HOST_VALIDATION: EngineDBEnv.SECURED_HOST_VALIDATION, + DEK.USER: EngineDBEnv.USER, + DEK.PASSWORD: EngineDBEnv.PASSWORD, + DEK.DATABASE: EngineDBEnv.DATABASE, + DEK.CONNECTION: EngineDBEnv.CONNECTION, + DEK.PGPASSFILE: EngineDBEnv.PGPASS_FILE, + DEK.NEW_DATABASE: EngineDBEnv.NEW_DATABASE, + DEK.DUMPER: EngineDBEnv.DUMPER, + DEK.FILTER: EngineDBEnv.FILTER, + DEK.RESTORE_JOBS: EngineDBEnv.RESTORE_JOBS, } @@ -104,6 +115,9 @@ DEFAULT_DB_PASSWORD = '' DEFAULT_DB_SECURED = False DEFAULT_DB_SECURED_HOST_VALIDATION = False + DEFAULT_DB_DUMPER = 'pg_custom' + DEFAULT_DB_RESTORE_JOBS = 2 + DEFAULT_DB_FILTER = None @util.export @@ -264,6 +278,24 @@ def PASSWORD(self): return 'OVESETUP_DWH_DB/password' + @osetupattrs( + answerfile=True, + ) + def DUMPER(self): + return 'OVESETUP_DWH_DB/dumper' + + @osetupattrs( + answerfile=True, + ) + def FILTER(self): + return 'OVESETUP_DWH_DB/filter' + + @osetupattrs( + answerfile=True, + ) + def RESTORE_JOBS(self): + return 'OVESETUP_DWH_DB/restoreJobs' + CONNECTION = 'OVESETUP_DWH_DB/connection' STATEMENT = 'OVESETUP_DWH_DB/statement' PGPASS_FILE = 'OVESETUP_DWH_DB/pgPassFile' @@ -391,6 +423,24 @@ PGPASS_FILE = 'OVESETUP_DB/pgPassFile' NEW_DATABASE = 'OVESETUP_DB/newDatabase' + @osetupattrs( + answerfile=True, + ) + def DUMPER(self): + return 'OVESETUP_DB/dumper' + + @osetupattrs( + answerfile=True, + ) + def FILTER(self): + return 'OVESETUP_DB/filter' + + @osetupattrs( + answerfile=True, + ) + def RESTORE_JOBS(self): + return 'OVESETUP_DB/restoreJobs' + @util.export @util.codegen -- To view, visit https://gerrit.ovirt.org/39502 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a07e5fef2f8aea6310047eb5210ad5d36be653a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
