Simone Tiraboschi has uploaded a new change for review. Change subject: Removing interdependencies beetween engine and websocket proxy ......................................................................
Removing interdependencies beetween engine and websocket proxy It's the first step to let the user install and configure the WebSocket Proxy on a different host as described here: http://www.ovirt.org/Features/WebSocketProxy_on_a_separate_host Now I'm simply removing interdependencies beetween them Change-Id: I433ab866409652b10f1010fadb1da50995cc74d6 Related-to: https://bugzilla.redhat.com/1080992 Related-to: https://bugzilla.redhat.com/985945 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> --- M ovirt-engine.spec.in M packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py R packaging/setup/plugins/ovirt-engine-remove/base/files/__init__.py R packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py 4 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/27497/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 4ca30ab..f4f8ef5 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -184,7 +184,6 @@ Requires: %{name}-tools = %{version}-%{release} Requires: %{name}-userportal = %{version}-%{release} Requires: %{name}-webadmin-portal = %{version}-%{release} -Requires: %{name}-websocket-proxy >= %{version}-%{release} Requires: java Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2 Requires: jboss-as >= 7.1.1-9.3 diff --git a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py index 7eb32e7..9462304 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py @@ -137,8 +137,8 @@ dialog=self.dialog, name='OVESETUP_CORE_REMOVE', note=_( - 'ovirt-engine is about to be removed, data will ' - 'be lost (@VALUES@) [@DEFAULT@]: ' + 'Installed ovirt components are about to be removed, ' + 'data will be lost (@VALUES@) [@DEFAULT@]: ' ), prompt=True, true=_('OK'), diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/__init__.py b/packaging/setup/plugins/ovirt-engine-remove/base/files/__init__.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/__init__.py rename to packaging/setup/plugins/ovirt-engine-remove/base/files/__init__.py diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/simple.py b/packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/files/simple.py rename to packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py -- To view, visit http://gerrit.ovirt.org/27497 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I433ab866409652b10f1010fadb1da50995cc74d6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
