Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: add ENGINE_FQDN variable to service configuration
......................................................................
packaging: add ENGINE_FQDN variable to service configuration
The engine FQDN is required for dependencies such as dwhj and reports to
successfully find engine.
Change-Id: Icc2a12280813bc7462ba62bf9e9a7b5358811147
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/fedora/engine-service.sysconfig
M packaging/fedora/setup/common_utils.py
M packaging/fedora/setup/engine-setup.py
3 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/7384/1
diff --git a/packaging/fedora/engine-service.sysconfig
b/packaging/fedora/engine-service.sysconfig
index 0ca695c..9c05e20 100644
--- a/packaging/fedora/engine-service.sysconfig
+++ b/packaging/fedora/engine-service.sysconfig
@@ -71,6 +71,11 @@
#ENGINE_AJP_ENABLED=false
#
+# Engine host FQDN
+#
+# ENGINE_FQDN="localhost.localdomain"
+
+#
# Ports used by the web server (the proxy) and by the connectors
# of the application server:
#
diff --git a/packaging/fedora/setup/common_utils.py
b/packaging/fedora/setup/common_utils.py
index c9c352b..0d91985 100755
--- a/packaging/fedora/setup/common_utils.py
+++ b/packaging/fedora/setup/common_utils.py
@@ -919,7 +919,7 @@
return (values["fqdn"], values["httpPort"], values["httpsPort"])
-def editEngineSysconfig(proxyEnabled, dbUrl, dbUser, http, https):
+def editEngineSysconfig(proxyEnabled, dbUrl, dbUser, fqdn, http, https):
# Load the file:
logging.debug("Loading text file handler")
handler = TextConfigFileHandler(basedefs.FILE_ENGINE_SYSCONFIG)
@@ -929,6 +929,9 @@
handler.editParam("ENGINE_DB_URL", dbUrl)
handler.editParam("ENGINE_DB_USER", dbUser)
+ # Put FQDN for use by other components
+ handler.editParam("ENGINE_FQDN", fqdn)
+
# Save port numbers and enabled/disabled state:
if proxyEnabled:
handler.editParam("ENGINE_PROXY_ENABLED", "true")
diff --git a/packaging/fedora/setup/engine-setup.py
b/packaging/fedora/setup/engine-setup.py
index 62331d4..0d91259 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -1875,6 +1875,7 @@
utils.editEngineSysconfig(proxyEnabled=proxyEnabled,
dbUrl=dbUrl,
dbUser=utils.getDbUser(),
+ fqdn=controller.CONF["HOST_FQDN"],
http=controller.CONF["HTTP_PORT"],
https=controller.CONF["HTTPS_PORT"])
--
To view, visit http://gerrit.ovirt.org/7384
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc2a12280813bc7462ba62bf9e9a7b5358811147
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
