Alex Lourie has uploaded a new change for review. Change subject: packaging: updated utility function for parsing web-conf.js ......................................................................
packaging: updated utility function for parsing web-conf.js Change-Id: Ic81a7a10d33a608fee3011ccdf462d7e74ecf52c Signed-off-by: Alex Lourie <[email protected]> --- M packaging/fedora/setup/common_utils.py 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/7639/1 diff --git a/packaging/fedora/setup/common_utils.py b/packaging/fedora/setup/common_utils.py index 318c253..2c510a6 100755 --- a/packaging/fedora/setup/common_utils.py +++ b/packaging/fedora/setup/common_utils.py @@ -906,16 +906,16 @@ return dbListRemove -def getHostParams(): +def getHostParams(webconf): """ get hostname & secured port from /etc/ovirt-engine/web-conf.js """ - logging.debug("looking for configuration from %s", basedefs.FILE_JBOSS_HTTP_PARAMS) - if not os.path.exists(basedefs.FILE_JBOSS_HTTP_PARAMS): - raise Exception("Could not find %s" % basedefs.FILE_JBOSS_HTTP_PARAMS) + logging.debug("looking for configuration from %s", webconf) + if not os.path.exists(webconf): + raise Exception("Could not find %s" % webconf) - handler = TextConfigFileHandler(basedefs.FILE_JBOSS_HTTP_PARAMS) + handler = TextConfigFileHandler(webconf) handler.open() pattern = "\"(.+)\";" @@ -931,8 +931,8 @@ values[name] = found.group(1) logging.debug("%s is: %s", name, value) else: - logging.error("Could not find the %s value in %s", name, basedefs.FILE_JBOSS_HTTP_PARAMS) - raise Exception(output_messages.ERR_EXP_PARSE_WEB_CONF % (name, basedefs.FILE_JBOSS_HTTP_PARAMS)) + logging.error("Could not find the %s value in %s", name, webconf) + raise Exception(output_messages.ERR_EXP_PARSE_WEB_CONF % (name, webconf)) return (values["fqdn"], values["httpPort"], values["httpsPort"]) -- To view, visit http://gerrit.ovirt.org/7639 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic81a7a10d33a608fee3011ccdf462d7e74ecf52c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
