Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: setup: align engine and dwh const
......................................................................
packaging: setup: align engine and dwh const
Aligned engine and dwh DB constants with ovirt-engine and ovirt-dwh,
adding db credentials to answer file and summary
also when executed on separate hosts.
Change-Id: Ib7985bf73fffbf6799269d01d1a5c3adbbae7439
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/reports/constants.py
1 file changed, 116 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/77/29177/1
diff --git a/packaging/setup/ovirt_engine_setup/reports/constants.py
b/packaging/setup/ovirt_engine_setup/reports/constants.py
index 5005024..ade2543 100644
--- a/packaging/setup/ovirt_engine_setup/reports/constants.py
+++ b/packaging/setup/ovirt_engine_setup/reports/constants.py
@@ -498,30 +498,132 @@
'OVESETUP_REPORTS_APACHE/configFileOvirtEngineReports'
+@util.export
+@util.codegen
+@osetupattrsclass
class DWHDBEnv(object):
"""Sync with ovirt-dwh"""
- HOST = 'OVESETUP_DWH_DB/host'
- PORT = 'OVESETUP_DWH_DB/port'
- SECURED = 'OVESETUP_DWH_DB/secured'
- SECURED_HOST_VALIDATION = 'OVESETUP_DWH_DB/securedHostValidation'
- DATABASE = 'OVESETUP_DWH_DB/database'
- USER = 'OVESETUP_DWH_DB/user'
- PASSWORD = 'OVESETUP_DWH_DB/password'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database host'),
+ )
+ def HOST(self):
+ return 'OVESETUP_DWH_DB/host'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database port'),
+ )
+ def PORT(self):
+ return 'OVESETUP_DWH_DB/port'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database secured connection'),
+ )
+ def SECURED(self):
+ return 'OVESETUP_DWH_DB/secured'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database host name validation'),
+ )
+ def SECURED_HOST_VALIDATION(self):
+ return 'OVESETUP_DWH_DB/securedHostValidation'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database name'),
+ )
+ def DATABASE(self):
+ return 'OVESETUP_DWH_DB/database'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('DWH database user name'),
+ )
+ def USER(self):
+ return 'OVESETUP_DWH_DB/user'
+
+ @osetupattrs(
+ answerfile=True,
+ )
+ def PASSWORD(self):
+ return 'OVESETUP_DWH_DB/password'
+
CONNECTION = 'OVESETUP_DWH_DB/connection'
STATEMENT = 'OVESETUP_DWH_DB/statement'
PGPASS_FILE = 'OVESETUP_DWH_DB/pgPassFile'
NEW_DATABASE = 'OVESETUP_DWH_DB/newDatabase'
+@util.export
+@util.codegen
+@osetupattrsclass
class EngineDBEnv(object):
"""Sync with ovirt-engine"""
- HOST = 'OVESETUP_DB/host'
- PORT = 'OVESETUP_DB/port'
- SECURED = 'OVESETUP_DB/secured'
- SECURED_HOST_VALIDATION = 'OVESETUP_DB/securedHostValidation'
- DATABASE = 'OVESETUP_DB/database'
- USER = 'OVESETUP_DB/user'
- PASSWORD = 'OVESETUP_DB/password'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database host'),
+ )
+ def HOST(self):
+ return 'OVESETUP_DB/host'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database port'),
+ )
+ def PORT(self):
+ return 'OVESETUP_DB/port'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database secured connection'),
+ )
+ def SECURED(self):
+ return 'OVESETUP_DB/secured'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database host name validation'),
+ )
+ def SECURED_HOST_VALIDATION(self):
+ return 'OVESETUP_DB/securedHostValidation'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database name'),
+ )
+ def DATABASE(self):
+ return 'OVESETUP_DB/database'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database user name'),
+ )
+ def USER(self):
+ return 'OVESETUP_DB/user'
+
+ @osetupattrs(
+ answerfile=True,
+ )
+ def PASSWORD(self):
+ return 'OVESETUP_DB/password'
+
CONNECTION = 'OVESETUP_DB/connection'
STATEMENT = 'OVESETUP_DB/statement'
PGPASS_FILE = 'OVESETUP_DB/pgPassFile'
--
To view, visit http://gerrit.ovirt.org/29177
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7985bf73fffbf6799269d01d1a5c3adbbae7439
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
