Yaniv Dary has uploaded a new change for review. Change subject: packaging: rename config values to match engine convention ......................................................................
packaging: rename config values to match engine convention Change-Id: Ib3abbd0b89abdf003927be48f19adb4b5f70874e Bug-Url: https://bugzilla.redhat.com/1043957 Signed-off-by: Yaniv Dary <yd...@redhat.com> --- M packaging/common_utils.py M packaging/ovirt-engine-reports-setup.py 2 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/83/22483/1 diff --git a/packaging/common_utils.py b/packaging/common_utils.py index 1d0aab6..6ae77ee 100755 --- a/packaging/common_utils.py +++ b/packaging/common_utils.py @@ -944,7 +944,7 @@ '{host}:{port}:{database}:{user}:{password}\n' '{host}:{port}:{database}:{engine_user}:{engine_pass}\n' '{host}:{port}:{engine_db}:{engine_user}:{engine_pass}\n' - '{host}:{port}:{dwh_db}:{dwh_user}:{dwh_pass}\n' + '{host}:{port}:{dwh_db}:{dwh_db_user}:{dwh_db_password}\n' ).format( host=db_dict['host'], port=db_dict['port'], @@ -955,8 +955,8 @@ engine_user=db_dict['engine_user'], engine_pass=db_dict['engine_pass'], dwh_db=db_dict['dwh_database'], - dwh_user=db_dict['dwh_user'], - dwh_pass=db_dict['dwh_pass'], + dwh_db_user=db_dict['dwh_db_user'], + dwh_db_password=db_dict['dwh_db_password'], ), ) @@ -1212,9 +1212,9 @@ ) as rf: rf.write( ( - 'REPORTS_DATABASE={database}\n' - 'REPORTS_USER={user}\n' - 'REPORTS_PASSWORD={password}' + 'REPORTS_DB_DATABASE={database}\n' + 'REPORTS_DB_USER={user}\n' + 'REPORTS_DB_PASSWORD={password}' ).format( database=db_dict['dbname'], user=db_dict['username'], diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index dbf94ec..033bc48 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -49,7 +49,7 @@ ENGINE_DB_DATABASE = "engine" ENGINE_HISTORY_DB_NAME = "ovirt_engine_history" REPORTS_DB_USER = 'engine_reports' -DWH_USER = 'engine_history' +DWH_DB_USER = 'engine_history' REPORTS_SERVER_DIR = "/usr/share/%s" % JRS_PACKAGE_NAME REPORTS_SERVER_BUILDOMATIC_DIR = "%s/buildomatic" % REPORTS_SERVER_DIR @@ -253,8 +253,8 @@ xml_editor = utils.XMLConfigFileHandler(FILE_DB_DATA_SOURCE) xml_editor.open() xml_editor.editParams({'/jdbcDataSource/connectionUrl':"jdbc:postgresql://%s:%s/%s" % (db_dict["host"],db_dict["port"],ENGINE_HISTORY_DB_NAME)}) - xml_editor.editParams({'/jdbcDataSource/connectionUser':db_dict["dwh_user"]}) - xml_editor.editParams({'/jdbcDataSource/connectionPassword':db_dict["dwh_pass"]}) + xml_editor.editParams({'/jdbcDataSource/connectionUser':db_dict["dwh_db_user"]}) + xml_editor.editParams({'/jdbcDataSource/connectionPassword':db_dict["dwh_db_password"]}) xml_editor.close() def resetReportsDatasourcePassword(): @@ -324,17 +324,17 @@ handler.open() for k, v in ( - ('dbname', 'REPORTS_DATABASE'), + ('dbname', 'REPORTS_DB_DATABASE'), ('host', 'ENGINE_DB_HOST'), ('port', 'ENGINE_DB_PORT'), - ('username', 'REPORTS_USER'), - ('password', 'REPORTS_PASSWORD'), + ('username', 'REPORTS_DB_USER'), + ('password', 'REPORTS_DB_PASSWORD'), ('engine_db', 'ENGINE_DB_DATABASE'), ('engine_user', 'ENGINE_DB_USER'), ('engine_pass', 'ENGINE_DB_PASSWORD'), - ('dwh_database', 'DWH_DATABASE'), - ('dwh_user', 'DWH_USER'), - ('dwh_pass', 'DWH_PASSWORD'), + ('dwh_database', 'DWH_DB_DATABASE'), + ('dwh_db_user', 'DWH_DB_USER'), + ('dwh_db_password', 'DWH_DB_PASSWORD'), ): s = handler.getParam(v) if s is not None: @@ -962,8 +962,8 @@ 'host': db_dict['host'], 'port': db_dict['port'], 'dbname': db_dict['dwh_database'], - 'username': db_dict['dwh_user'], - 'password': db_dict['dwh_pass'], + 'username': db_dict['dwh_db_user'], + 'password': db_dict['dwh_db_password'], 'engine_user': db_dict['engine_user'], }, TEMP_PGPASS=TEMP_PGPASS, -- To view, visit http://gerrit.ovirt.org/22483 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3abbd0b89abdf003927be48f19adb4b5f70874e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
