Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: spec: drop all-in-one on el6
......................................................................
packaging: spec: drop all-in-one on el6
Since VDSM is not available anymore for el6
all-in-one setup is not available anymore
due to missing dependencies.
Change-Id: I4eb369dd83dd0002a74dc74b37a91e4a6f02ad6d
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M ovirt-engine.spec.in
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/40162/1
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 7d8fd5e..03c81f8 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -43,11 +43,14 @@
%global EXTRA_BUILD_FLAGS
%{?_ovirt_build_extra_flags:%{_ovirt_build_extra_flags}}%{?ovirt_build_extra_flags:
%{ovirt_build_extra_flags}}
%endif
+
+
%if 0%{?fedora}
%global ovirt_install_systemd 1
%global ovirt_install_systemv 0
%global ovirt_install_poms 1
%global ovirt_require_maven 1
+%global with_aio 1
%if %{fedora} >= 20
%global ovirt_provides_jboss 1
%global jboss ovirt-engine-jboss-as >= 7.1.1
@@ -65,6 +68,7 @@
%global ovirt_require_maven 1
%global ovirt_provides_jboss 1
%global jboss ovirt-engine-jboss-as >= 7.1.1
+%global with_aio 1
%else
%global ovirt_install_systemd 0
%global ovirt_install_systemv 1
@@ -72,6 +76,10 @@
%global ovirt_require_maven 0
%global ovirt_provides_jboss 1
%global jboss ovirt-engine-jboss-as >= 7.1.1
+
+# all-in-one can't work on el6 due to missing ovirt-host-deploy-offline
+# and missing vdsm
+%global with_aio 0
# emulate fedora java for simplicity
%undefine add_maven_depmap
@@ -581,6 +589,7 @@
%description setup-plugin-websocket-proxy
Setup and upgrade specific plugins for websocket-proxy
+%if %{with_aio}
%package setup-plugin-allinone
Summary: All-in-one plugin for %{ovirt_product_name_short}'s setup
Group: %{ovirt_product_group}
@@ -593,6 +602,8 @@
%description setup-plugin-allinone
All-in-one plugin for %{ovirt_product_name_short}'s setup
+%endif
+
%prep
%setup -c -q
@@ -830,6 +841,7 @@
[environment:default]
OVESETUP_APACHE/configureRootRedirectionDefault=bool:True
__EOF__
+%if %{with_aio}
cat >
"%{buildroot}%{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-aio.conf" <<
__EOF__
[environment:default]
OVESETUP_AIO/enable=bool:True
@@ -839,6 +851,7 @@
[environment:default]
VDSM/disableNetworkManager=bool:False
__EOF__
+%endif
%if %{ovirt_provides_jboss}
cat >
"%{buildroot}%{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-jboss.conf"
<< __EOF__
@@ -1065,11 +1078,13 @@
%{engine_data}/setup/ovirt_engine_setup/websocket_proxy/
%{engine_data}/setup/plugins/*/websocket_proxy/
+%if %{with_aio}
%files setup-plugin-allinone
%config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-aio.conf
%config %{_sysconfdir}/ovirt-host-deploy.conf.d/10-packaging-aio.conf
%{engine_data}/firewalld/aio/
+%endif
%files dbscripts
--
To view, visit https://gerrit.ovirt.org/40162
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4eb369dd83dd0002a74dc74b37a91e4a6f02ad6d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
