Yaniv Dary has uploaded a new change for review. Change subject: etl: now connects to health status with ssl (#851833) ......................................................................
etl: now connects to health status with ssl (#851833) https://bugzilla.redhat.com/851833 Change-Id: I94350074bbe545a9a91e38ecd1da8779ca87dc61 Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties M data-warehouse/history_etl/history_service/history_service.sh M packaging/ovirt-engine-dwh-setup.py 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/69/7469/1 diff --git a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties index 528adb0..195744f 100644 --- a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties +++ b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties @@ -20,11 +20,11 @@ #Connection Definition to Engine Health Status Portal ## Connection Protocol (SSL or Unencrypted) -ovirtEnginePortalConnectionProtocol=http +ovirtEnginePortalConnectionProtocol=https ## Portal Address (JBoss' Location) ovirtEnginePortalAddress=localhost ## Portal Port (JBoss' Port) -ovirtEnginePortalPort=8080 +ovirtEnginePortalPort=443 # Delete Job Run Time (0 to 23 = Midnight to Eleven PM) runDeleteTime=3 diff --git a/data-warehouse/history_etl/history_service/history_service.sh b/data-warehouse/history_etl/history_service/history_service.sh index fb1f0ec..db099db 100755 --- a/data-warehouse/history_etl/history_service/history_service.sh +++ b/data-warehouse/history_etl/history_service/history_service.sh @@ -4,7 +4,8 @@ LOGFILE="/var/log/ovirt-engine/ovirt-engine-dwhd.log" ETL_HOME=/usr/share/ovirt-engine-dwh/etl JAVA_DIR=/usr/share/java +RUN_PROPERTIES="-Xms256M -Xmx1024M" CP=$ETL_HOME:$JAVA_DIR/ovirt-engine-dwh/historyETLProcedure.jar:$JAVA_DIR/ovirt-engine-dwh/advancedPersistentLookupLib.jar:$JAVA_DIR/ovirt-engine-dwh/talendRoutines.jar:$JAVA_DIR/dom4j.jar:$JAVA_DIR/commons-collections.jar:$JAVA_DIR/log4j.jar:$JAVA_DIR/postgresql-jdbc.jar -exec java -Xms256M -Xmx1024M -cp $CP ovirt_engine_dwh.historyetl_3_1.HistoryETL --context=Default $* >> $LOGFILE 2>&1 & +exec java $RUN_PROPERTIES -cp $CP ovirt_engine_dwh.historyetl_3_1.HistoryETL --context=Default $* >> $LOGFILE 2>&1 & echo $! >$ETL_PID diff --git a/packaging/ovirt-engine-dwh-setup.py b/packaging/ovirt-engine-dwh-setup.py index 048288d..0a44c58 100755 --- a/packaging/ovirt-engine-dwh-setup.py +++ b/packaging/ovirt-engine-dwh-setup.py @@ -129,9 +129,20 @@ "jdbc\:postgresql\://%s\:%s/engine?stringtype\=unspecified" % (db_dict["host"], db_dict["port"])) file_handler.editParam("ovirtEngineHistoryDbJdbcConnection", "jdbc\:postgresql\://%s\:%s/ovirt_engine_history?stringtype\=unspecified" % (db_dict["host"], db_dict["port"])) + file_handler.editParam("ovirtEnginePortalAddress", fqdn) file_handler.editParam("ovirtEnginePortalPort", port) file_handler.close() + # Updating run properties + handler = utils.TextConfigFileHandler("/usr/share/ovirt-engine-dwh/etl/history_service.sh") + handler.open() + properties = handler.getParam("RUN_PROPERTIES") + if properties and "trustStore" not in properties: + newlist = properties.replace('"', '') + newlist = '"' + newlist + ' -Djavax.net.ssl.trustStore=' + utils.getVDCOption("TruststoreUrl") + ' -Djavax.net.ssl.trustStorePassword=' + utils.getVDCOption("TruststorePass") + '"' + handler.editParam("RUN_PROPERTIES", newlist) + handler.close() + def getHostParams(secure=True): """ get hostname & secured port from /etc/sysconfig/ovirt-engine -- To view, visit http://gerrit.ovirt.org/7469 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94350074bbe545a9a91e38ecd1da8779ca87dc61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
