Change in ovirt-engine[master]: packaging, tools: Generate engine-config.xml from template

[oschreib at redhat.com]

Ofer Schreiber has submitted this change and it was merged.

Change subject: packaging, tools: Generate engine-config.xml from template
......................................................................


packaging, tools: Generate engine-config.xml from template

This change converts the engine-config.xml file into a
ovirt-engine.xml.in template that is copied from
/usr/share/ovirt-engine/service to /var/cache/ovirt-engine when
the engine starts.

The template is processed and the variables are replaced by the
values in /etc/sysconfig/ovirt-engine.

This change is combined with changes to engine-setup, the tools
(engine-config and engine-manage-domains) and the notifier so that
they don't manipulate the engine-config.xml file, but the simpler
/etc/sysconfig/ovirt-engine file.

Change-Id: I36c8ff572307a31e5f9f9749e6c3cc41858a2765
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
---
M Makefile
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsConfiguration.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsDAOImpl.java
M backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/db/ConfigDaoImpl.java
M backend/manager/tools/engine-config/src/test/resources/engine-config.conf
D backend/manager/tools/engine-config/src/test/resources/login-config.xml
D backend/manager/tools/engine-config/src/test/resources/postgres-ds.xml
M backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java
M backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
D backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/ConnectionHelper.java
M backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java
D backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/ConnectionHelperTest.java
M backend/manager/tools/engine-tools-common/pom.xml
D backend/manager/tools/engine-tools-common/src/main/java/org/ovirt/engine/core/tools/common/db/ConnectionFactory.java
D backend/manager/tools/engine-tools-common/src/main/java/org/ovirt/engine/core/tools/common/db/JbossConnectionFactory.java
A backend/manager/tools/engine-tools-common/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java
D backend/manager/tools/engine-tools-common/src/test/java/org/ovirt/engine/core/config/RhevConnectionFactoryTest.java
A backend/manager/tools/engine-tools-common/src/test/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSourceTest.java
D backend/manager/tools/engine-tools-common/src/test/resources/filters/engine-tools.conf
D backend/manager/tools/engine-tools-common/src/test/resources/login-config.xml
D backend/manager/tools/engine-tools-common/src/test/resources/postgres-ds.xml.decoded
D backend/manager/tools/engine-tools-common/src/test/resources/postgres-ds.xml.encoded
M packaging/fedora/engine-service.py
M packaging/fedora/engine-service.sysconfig
R packaging/fedora/engine-service.xml.in
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/common_utils.py
M packaging/fedora/setup/engine-cleanup.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/setup/engine-upgrade.py
M packaging/fedora/spec/ovirt-engine.spec.in
33 files changed, 489 insertions(+), 1,229 deletions(-)

Approvals:
  Ofer Schreiber: Verified; Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/5362
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36c8ff572307a31e5f9f9749e6c3cc41858a2765
Gerrit-PatchSet: 15
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>