Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Use engine.conf instead of sysconfig
......................................................................
packaging: Use engine.conf instead of sysconfig
The engine configuration file /etc/sysconfig/ovirt-engine has been
replaced by /etc/ovirt-engine/engine.conf.
Please don't merge this till the corresponding change in the engine has
been merged.
Change-Id: Ibb1ebd78c41b196f3a5ffc06128d41ab9543d87a
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M packaging/ovirt-engine-dwh-setup.py
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/93/7593/1
diff --git a/packaging/ovirt-engine-dwh-setup.py
b/packaging/ovirt-engine-dwh-setup.py
index a2d18d1..d09cd2a 100755
--- a/packaging/ovirt-engine-dwh-setup.py
+++ b/packaging/ovirt-engine-dwh-setup.py
@@ -26,7 +26,7 @@
EXEC_CREATE_DB="%s/ovirt-engine-history-db-install.sh" % PATH_DB_SCRIPTS
EXEC_UPGRADE_DB="upgrade.sh"
FILE_DB_CONN = "/etc/ovirt-engine/ovirt-engine-dwh/Default.properties"
-FILE_WEB_CONF = "/etc/sysconfig/ovirt-engine"
+FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf"
FILE_PG_PASS="/root/.pgpass"
DB_USER_NAME = "postgres"
DB_PORT = "5432"
@@ -146,18 +146,18 @@
def getHostParams(secure=True):
"""
- get protocol, hostname & secured port from /etc/sysconfig/ovirt-engine
+ get protocol, hostname & secured port from /etc/ovirt-engine/engine.conf
"""
protocol = "https" if secure else "http"
hostFqdn = None
port = None
- if not os.path.exists(FILE_WEB_CONF):
- raise Exception("Could not find %s" % FILE_WEB_CONF)
+ if not os.path.exists(FILE_ENGINE_CONF):
+ raise Exception("Could not find %s" % FILE_ENGINE_CONF)
- logging.debug("reading %s", FILE_WEB_CONF)
- file_handler = utils.TextConfigFileHandler(FILE_WEB_CONF)
+ logging.debug("reading %s", FILE_ENGINE_CONF)
+ file_handler = utils.TextConfigFileHandler(FILE_ENGINE_CONF)
file_handler.open()
proxyEnabled = file_handler.getParam("ENGINE_PROXY_ENABLED")
if proxyEnabled != None and proxyEnabled.lower() in ["true", "t", "yes",
"y", "1"]:
@@ -180,10 +180,10 @@
logging.debug("Host's FQDN: %s", hostFqdn)
if not hostFqdn:
- logging.error("Could not find the HOST FQDN from %s", FILE_WEB_CONF)
+ logging.error("Could not find the HOST FQDN from %s", FILE_ENGINE_CONF)
raise Exception("Cannot find host fqdn from configuration, please
verify that ovirt-engine is configured")
if not port:
- logging.error("Could not find the web port from %s", FILE_WEB_CONF)
+ logging.error("Could not find the web port from %s", FILE_ENGINE_CONF)
raise Exception("Cannot find the web port from configuration, please
verify that ovirt-engine is configured")
return (protocol, hostFqdn, port)
--
To view, visit http://gerrit.ovirt.org/7593
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb1ebd78c41b196f3a5ffc06128d41ab9543d87a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
