Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: using engine-common in websocketproxy plugins
......................................................................
packaging: setup: using engine-common in websocketproxy plugins
Loosen up engine-common requirements in order to use it
from wsp plugins.
Change-Id: I7cb1245105f913f0c82fb3b909f14584053e8a0f
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M ovirt-engine.spec.in
M packaging/setup/ovirt_engine_setup/engine_common/constants.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
4 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/33940/1
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 6da845f..9cfdca1 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -536,7 +536,7 @@
%package setup-plugin-websocket-proxy
Summary: Setup and upgrade specific plugins for websocket-proxy
-Requires: %{name}-setup-base = %{version}-%{release}
+Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
%description setup-plugin-websocket-proxy
Setup and upgrade specific plugins for websocket-proxy
diff --git a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
index 8022a79..6237f75 100644
--- a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
+++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
@@ -217,6 +217,7 @@
JBOSS_DIRECT_HTTPS_PORT = 'OVESETUP_CONFIG/jbossDirectHttpsPort'
JBOSS_DEBUG_ADDRESS = 'OVESETUP_CONFIG/jbossDebugAddress'
JBOSS_NEEDED = 'OVESETUP_CONFIG/jbossNeeded'
+ JAVA_NEEDED = 'OVESETUP_CONFIG/javaNeeded'
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py
index 486708e..b04ad97 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py
@@ -49,12 +49,20 @@
oengcommcons.ConfigEnv.JAVA_HOME,
None
)
+ self.environment.setdefault(
+ oengcommcons.ConfigEnv.JAVA_NEEDED,
+ False
+ )
@plugin.event(
stage=plugin.Stages.STAGE_VALIDATION,
- condition=lambda self: self.environment[
- oengcommcons.ConfigEnv.JAVA_HOME
- ] is None,
+ condition=lambda self: (
+ self.environment[
+ oengcommcons.ConfigEnv.JAVA_NEEDED
+ ] and self.environment[
+ oengcommcons.ConfigEnv.JAVA_HOME
+ ] is None
+ ),
)
def _validation(self):
self.environment[
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
index 1ecffb6..2f37f74 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py
@@ -46,6 +46,7 @@
stage=plugin.Stages.STAGE_SETUP,
)
def _setup(self):
+ self.environment[oengcommcons.ConfigEnv.JAVA_NEEDED] = True
self.environment[oengcommcons.ConfigEnv.JBOSS_NEEDED] = True
@plugin.event(
--
To view, visit http://gerrit.ovirt.org/33940
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cb1245105f913f0c82fb3b909f14584053e8a0f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
