Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: use tools new conf.d feature
......................................................................
packaging: use tools new conf.d feature
Change-Id: I4849ac3dcefeb22b7aea725b6bd734174d6778e2
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/spec/ovirt-engine.spec.in
3 files changed, 38 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/13151/1
diff --git a/packaging/fedora/setup/basedefs.py
b/packaging/fedora/setup/basedefs.py
index 8b111ee..59bef80 100644
--- a/packaging/fedora/setup/basedefs.py
+++ b/packaging/fedora/setup/basedefs.py
@@ -97,16 +97,30 @@
FILE_APACHE_PRIVATE_KEY="%s/keys/apache.key.nopass"%(DIR_OVIRT_PKI)
FILE_SSH_PRIVATE_KEY="%s/keys/engine_id_rsa"%(DIR_OVIRT_PKI)
FILE_YUM_VERSION_LOCK="/etc/yum/pluginconf.d/versionlock.list"
-FILE_ISOUPLOADER_CONF="/etc/ovirt-engine/isouploader.conf"
-FILE_LOGCOLLECTOR_CONF="/etc/ovirt-engine/logcollector.conf"
FILE_PSQL_CONF="/var/lib/pgsql/data/postgresql.conf"
FILE_OVIRT_HTTPD_CONF_TEMPLATE="%s/conf/ovirt-engine-proxy.conf.in" %
DIR_ENGINE
FILE_OVIRT_HTTPD_CONF="/etc/httpd/conf.d/ovirt-engine.conf"
FILE_HTTPD_SSL_CONFIG="/etc/httpd/conf.d/ssl.conf"
FILE_HTTPD_CONF="/etc/httpd/conf/httpd.conf"
-FILE_IMAGE_UPLOADER_CONF="/etc/ovirt-engine/imageuploader.conf"
FILE_ENGINE_VERSION = "%s/version" % DIR_CONFIG
+
+TOOLS_CONFIG = [
+ {
+ "dir": "/etc/ovirt-engine/isouploader.conf.d",
+ "section": "ISOUploader",
+ },
+ {
+ "dir": "/etc/ovirt-engine/imageuploader.conf.d",
+ "section": "ImageUploader",
+ },
+ {
+ "dir": "/etc/ovirt-engine/logcollector.conf.d",
+ "section": "LogCollector",
+ },
+]
+
+
# Previous versions of the engine used these files to store the
# configuration:
FILE_ENGINE_SYSCONFIG="/etc/sysconfig/ovirt-engine"
diff --git a/packaging/fedora/setup/engine-setup.py
b/packaging/fedora/setup/engine-setup.py
index 9238bec..087ab29 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -1992,21 +1992,24 @@
"""
add the user & host:secrue_port values to logcollector.conf and
isouploader.conf
"""
- for confFile in [basedefs.FILE_LOGCOLLECTOR_CONF,
basedefs.FILE_ISOUPLOADER_CONF, basedefs.FILE_IMAGE_UPLOADER_CONF]:
- if os.path.isfile(confFile):
- logging.debug("Editing %s" % confFile)
- fileHandler = utils.TextConfigFileHandler(confFile)
- fileHandler.open()
-
- logging.debug("Adding host & secure port")
- fileHandler.editParam("engine", "%s:%s" %
(controller.CONF["HOST_FQDN"], controller.CONF["HTTPS_PORT"]))
-
- logging.debug("Adding username")
- fileHandler.editParam("user", "%s@%s" % (basedefs.INTERNAL_ADMIN,
basedefs.INTERNAL_DOMAIN))
-
- fileHandler.close()
- else:
- logging.debug("Could not find %s" % confFile)
+ for entry in basedefs.TOOLS_CONFIG:
+ conf = os.path.join(entry['dir'], "50-engine-setup.conf")
+ if not os.path.exists(os.path.dirname(conf)):
+ os.mkdir(os.path.dirname(conf))
+ with open(conf, "w") as f:
+ f.write(
+ (
+ "[{section}]\n"
+ "engine={fqdn}:{port}\n"
+ "user={user}@{domain}\n"
+ ).format(
+ section=entry['section'],
+ fqdn=controller.CONF["HOST_FQDN"],
+ port=controller.CONF["HTTPS_PORT"],
+ user=basedefs.INTERNAL_ADMIN,
+ domain=basedefs.INTERNAL_DOMAIN,
+ )
+ )
def _summaryParamsToLog():
if len(controller.CONF) > 0:
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index a4fb29c..6f842c2 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -160,9 +160,9 @@
Requires: %{name}-webadmin-portal = %{version}-%{release}
# Require other tool packages:
-Requires: ovirt-iso-uploader
-Requires: ovirt-image-uploader
-Requires: ovirt-log-collector
+Requires: ovirt-iso-uploader >= 3.3.0
+Requires: ovirt-image-uploader >= 3.3.0
+Requires: ovirt-log-collector >= 3.3.0
# Make sure that obsolete subpackages are removed:
Obsoletes: %{name}-genericapi
--
To view, visit http://gerrit.ovirt.org/13151
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4849ac3dcefeb22b7aea725b6bd734174d6778e2
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
