Juan Hernandez has uploaded a new change for review. Change subject: packaging: Use engine.conf for local configuration ......................................................................
packaging: Use engine.conf for local configuration Commit 5a3141 of ovirt-engine moved the local configuration from /etc/sysconfig/ovirt-engine to /etc/ovirt-engine/engine.conf so the reports application needs to be modified accordingly. Change-Id: I824a61772325b4d29ceceb95933309e16f0d2435 Signed-off-by: Juan Hernandez <[email protected]> --- M packaging/ovirt-engine-reports-setup.py 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/14/12614/1 diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index ded5d42..2ad4431 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -50,8 +50,8 @@ REPORTS_JARS_DIR = "/usr/share/java/ovirt-engine-reports" FILE_DEPLOY_VERSION = "/etc/ovirt-engine/jrs-deployment.version" -FILE_WEB_CONF = "/etc/sysconfig/ovirt-engine" -FILE_ENGINE_SYSCONFIG = "/etc/sysconfig/ovirt-engine" +FILE_WEB_CONF = "/etc/ovirt-engine/engine.conf" +FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf" DIR_PKI = "/etc/pki/ovirt-engine" DB_EXIST = False MUCK_PASSWORD="oVirtadmin2009!" @@ -114,7 +114,7 @@ os.remove("%s/%s.war.dodeploy" % (DIR_DEPLOY,JRS_APP_NAME)) # Updating deploy params - handler = utils.TextConfigFileHandler(FILE_ENGINE_SYSCONFIG) + handler = utils.TextConfigFileHandler(FILE_ENGINE_CONF) handler.open() applist = handler.getParam("ENGINE_APPS") if applist and JRS_APP_NAME not in applist: @@ -457,8 +457,8 @@ else: return False -def updateEngineSysconfigPath(): - handler = utils.TextConfigFileHandler(FILE_ENGINE_SYSCONFIG) +def updateEngineConf(): + handler = utils.TextConfigFileHandler(FILE_ENGINE_CONF) handler.open() properties = handler.getParam("ENGINE_PROPERTIES") if properties: @@ -472,7 +472,7 @@ def getHostParams(secure=True): """ - get hostname & secured port from /etc/sysconfig/ovirt-engine + get hostname & secured port from /etc/ovirt-engine/engine.conf """ hostFqdn = None @@ -738,8 +738,8 @@ # Edit Data Sources Driver Info updateDsJdbc() - # Set sysconfig settings - updateEngineSysconfigPath() + # Set config settings + updateEngineConf() # Setup the SSO updateApplicationSecurity() -- To view, visit http://gerrit.ovirt.org/12614 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I824a61772325b4d29ceceb95933309e16f0d2435 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
