Change in ovirt-engine[master]: packaging: setup: refactoring

sbonazzo at redhat.com sbonazzo at redhat.com
Fri Dec 20 09:02:05 UTC 2013


Sandro Bonazzola has submitted this change and it was merged.

Change subject: packaging: setup: refactoring
......................................................................


packaging: setup: refactoring

Refactored the rpm packaging and setup code for splitting
ovirt-engine-setup in the following packages:

- ovirt-engine-setup
- ovirt-engine-setup-plugin-ovirt-engine
- ovirt-engine-setup-plugin-ovirt-engine-common
- ovirt-engine-setup-plugin-websocket-proxy

Installing ovirt-engine will pull in all of the above
since ovirt-engine is requiring ovirt-engine-websocket-proxy
which now requires ovirt-engine-setup-plugin-websocket-proxy.

Just installing ovirt-engine-setup
will let you to have a working engine-setup and engine-cleanup
wich actually do nothing usefull.

This will ease the migration to otopi for ovirt-dwh and
ovirt-reports and extracting websocket-proxy to its own
package.

Updated dependency on otopi for having nested plugins support.

Change-Id: I572da9cd7b4a2b9e1fdfee4c05e83a0ca31b99bc
Related-To: https://bugzilla.redhat.com/967350
Related-To: https://bugzilla.redhat.com/967351
Related-To: https://bugzilla.redhat.com/967356
Related-To: https://bugzilla.redhat.com/863758
Related-To: https://bugzilla.redhat.com/863757
Related-To: https://bugzilla.redhat.com/985945
Signed-off-by: Sandro Bonazzola <sbonazzo at redhat.com>
Signed-off-by: Alon Bar-Lev <alonbl at redhat.com>
---
M ovirt-engine.spec.in
R packaging/firewalld/ovirt-engine/ovirt-http.xml.in
R packaging/firewalld/ovirt-engine/ovirt-https.xml.in
R packaging/firewalld/ovirt-engine/ovirt-jboss-http.xml.in
R packaging/firewalld/ovirt-engine/ovirt-jboss-https.xml.in
R packaging/firewalld/ovirt-engine/ovirt-nfs.xml.in
R packaging/firewalld/ovirt-engine/ovirt-postgres.xml.in
R packaging/firewalld/websocket-proxy/ovirt-websocket-proxy.xml.in
M packaging/setup/ovirt_engine_setup/database.py
R packaging/setup/plugins/ovirt-engine-common/base/core/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py
R packaging/setup/plugins/ovirt-engine-common/base/core/engine.py
R packaging/setup/plugins/ovirt-engine-common/base/core/misc.py
R packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py
R packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.py
R packaging/setup/plugins/ovirt-engine-common/base/core/protocols.py
R packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.py
R packaging/setup/plugins/ovirt-engine-common/base/db/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/db/connection.py
R packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py
R packaging/setup/plugins/ovirt-engine-common/base/dialog/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py
R packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.py
R packaging/setup/plugins/ovirt-engine-common/base/network/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.py
R packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.py
R packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.py
R packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py
R packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py
R packaging/setup/plugins/ovirt-engine-common/base/system/__init__.py
R packaging/setup/plugins/ovirt-engine-common/base/system/apache.py
R packaging/setup/plugins/ovirt-engine-common/base/system/environment.py
R packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.py
C packaging/setup/plugins/ovirt-engine-common/websocket_proxy/__init__.py
R packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py
R packaging/setup/plugins/ovirt-engine-remove/base/core/__init__.py
R packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py
R packaging/setup/plugins/ovirt-engine-remove/base/network/__init__.py
R packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/__init__.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/__init__.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/__init__.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/simple.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py
A packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py
R packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py
C packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/__init__.py
A packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py
R packaging/setup/plugins/ovirt-engine-setup/base/core/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py
R packaging/setup/plugins/ovirt-engine-setup/base/network/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py
R packaging/setup/plugins/ovirt-engine-setup/base/network/hostname.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/selinux.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/productkey_upgrade.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py
C packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/preview.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/apache.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/ca.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/config.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/core.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/database.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/datadomain.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/firewalld.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/isodomain.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py
A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/localstate.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
C packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py
120 files changed, 260 insertions(+), 81 deletions(-)

Approvals:
  Sandro Bonazzola: Verified; Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I572da9cd7b4a2b9e1fdfee4c05e83a0ca31b99bc
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay at redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary at redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server



More information about the Engine-commits mailing list