Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: make backup dir configurable ......................................................................
packaging: setup: make backup dir configurable Change-Id: I4f89fdea43175807adf3afd3528f0ed7735cbbde Bug-Url: https://bugzilla.redhat.com/1110919 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py 4 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/38250/1 diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index acc1841..7ac13a3 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -67,7 +67,7 @@ OVIRT_ENGINE_DB_DIR, 'schema.sh', ) - OVIRT_ENGINE_DB_BACKUP_DIR = os.path.join( + OVIRT_ENGINE_DEFAULT_DB_BACKUP_DIR = os.path.join( OVIRT_ENGINE_LOCALSTATEDIR, 'backups', ) @@ -613,6 +613,12 @@ def ENGINE_HEAP_MAX(self): return 'OVESETUP_CONFIG/engineHeapMax' + @osetupattrs( + answerfile=True, + ) + def OVIRT_ENGINE_DB_BACKUP_DIR(self): + return 'OVESETUP_CONFIG/engineDbBackupDir' + @util.export @util.codegen diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py index ed4b284..65e5280 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py @@ -72,7 +72,9 @@ datetime.datetime.now().strftime('%Y%m%d%H%M%S') ), suffix='.tar.gz', - dir=oenginecons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + dir=self.environment[ + oenginecons.ConfigEnv.OVIRT_ENGINE_DB_BACKUP_DIR + ], ) os.fchown( fd, diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py index 5198769..61f8c55 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py @@ -99,7 +99,9 @@ ) dbovirtutils.tryDatabaseConnect() self._bkpfile = dbovirtutils.backup( - dir=oenginecons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + dir=self.environment[ + oenginecons.ConfigEnv.OVIRT_ENGINE_DB_BACKUP_DIR + ], prefix=oenginecons.Const.ENGINE_DB_BACKUP_PREFIX, ) self.logger.info( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py index 75b8495..02c1bc9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py @@ -238,7 +238,9 @@ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS, ) backupFile = dbovirtutils.backup( - dir=oenginecons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + dir=self.environment[ + oenginecons.ConfigEnv.OVIRT_ENGINE_DB_BACKUP_DIR + ], prefix=oenginecons.Const.ENGINE_DB_BACKUP_PREFIX, ) -- To view, visit https://gerrit.ovirt.org/38250 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f89fdea43175807adf3afd3528f0ed7735cbbde Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
