Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Allow separate hosts for dwh/reports ......................................................................
packaging: setup: Allow separate hosts for dwh/reports Change-Id: Idbcf1ae9e442d9ab3ab11a8fd68bde4ebc69cdad Bug-Url: https://bugzilla.redhat.com/1080997 Bug-Url: https://bugzilla.redhat.com/1080998 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M ovirt-engine.spec.in R packaging/firewalld/jboss/ovirt-http.xml.in R packaging/firewalld/jboss/ovirt-https.xml.in R packaging/firewalld/jboss/ovirt-jboss-http.xml.in R packaging/firewalld/jboss/ovirt-jboss-https.xml.in R packaging/firewalld/postgresql-server/ovirt-postgres.xml.in M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py A packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/__init__.py R packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/sysctl.py A packaging/setup/plugins/ovirt-engine-setup/jboss/config/__init__.py R packaging/setup/plugins/ovirt-engine-setup/jboss/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/__init__.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py A packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/__init__.py R packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/sysctl.py 17 files changed, 137 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/27502/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 1514294..2acf086 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -192,7 +192,8 @@ Requires: ovirt-image-uploader >= 3.3.0 Requires: ovirt-iso-uploader >= 3.3.0 Requires: ovirt-log-collector >= 3.3.0 -Requires: postgresql-server >= 8.4.7 +Requires: postgresql >= 8.4.7 +Requires: postgresql-jdbc >= 8.4.7 Requires: ws-commons-util Requires: yum-plugin-versionlock @@ -344,6 +345,7 @@ Requires: libxml2-python Requires: logrotate Requires: otopi >= 1.2.0-1 +Requires: httpd %description setup-base %{ovirt_product_name_short} suite base setup components. @@ -364,6 +366,8 @@ Summary: Setup and upgrade specific plugins for %{ovirt_product_name_short} Group: %{ovirt_product_group} Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release} +Requires: %{name}-setup-plugin-postgresql-server = %{version}-%{release} +Requires: %{name}-setup-plugin-jboss = %{version}-%{release} Requires: %{name} >= 3.3.2 Conflicts: %{name} < 3.3.2 @@ -539,6 +543,22 @@ %description setup-plugin-allinone All-in-one plugin for %{ovirt_product_name_short}'s setup + +%package setup-plugin-postgresql-server +Summary: Postgresql server plugin for %{ovirt_product_name_short}'s setup +Group: %{ovirt_product_group} +Requires: postgresql-server >= 8.4.7 + +%description setup-plugin-postgresql-server +Postgresql server plugin for %{ovirt_product_name_short}'s setup + +%package setup-plugin-jboss +Summary: JBoss plugin for %{ovirt_product_name_short}'s setup +Group: %{ovirt_product_group} +Requires: jboss-as >= 7.1.1-9.3 + +%description setup-plugin-jboss +JBoss plugin for %{ovirt_product_name_short}'s setup %prep %setup -c -q @@ -961,6 +981,16 @@ %config %{_sysconfdir}/ovirt-host-deploy.conf.d/10-packaging-aio.conf %{engine_data}/firewalld/aio/ +%files setup-plugin-postgresql-server + +%{engine_data}/firewalld/postgresql-server/ +%{engine_data}/setup/plugins/*/postgresql-server/ + +%files setup-plugin-jboss + +%{engine_data}/firewalld/jboss/ +%{engine_data}/setup/plugins/*/jboss/ + %files dbscripts %{engine_data}/dbscripts/ diff --git a/packaging/firewalld/ovirt-engine/ovirt-http.xml.in b/packaging/firewalld/jboss/ovirt-http.xml.in similarity index 100% rename from packaging/firewalld/ovirt-engine/ovirt-http.xml.in rename to packaging/firewalld/jboss/ovirt-http.xml.in diff --git a/packaging/firewalld/ovirt-engine/ovirt-https.xml.in b/packaging/firewalld/jboss/ovirt-https.xml.in similarity index 100% rename from packaging/firewalld/ovirt-engine/ovirt-https.xml.in rename to packaging/firewalld/jboss/ovirt-https.xml.in diff --git a/packaging/firewalld/ovirt-engine/ovirt-jboss-http.xml.in b/packaging/firewalld/jboss/ovirt-jboss-http.xml.in similarity index 100% rename from packaging/firewalld/ovirt-engine/ovirt-jboss-http.xml.in rename to packaging/firewalld/jboss/ovirt-jboss-http.xml.in diff --git a/packaging/firewalld/ovirt-engine/ovirt-jboss-https.xml.in b/packaging/firewalld/jboss/ovirt-jboss-https.xml.in similarity index 100% rename from packaging/firewalld/ovirt-engine/ovirt-jboss-https.xml.in rename to packaging/firewalld/jboss/ovirt-jboss-https.xml.in diff --git a/packaging/firewalld/ovirt-engine/ovirt-postgres.xml.in b/packaging/firewalld/postgresql-server/ovirt-postgres.xml.in similarity index 100% rename from packaging/firewalld/ovirt-engine/ovirt-postgres.xml.in rename to packaging/firewalld/postgresql-server/ovirt-postgres.xml.in diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py index 17671a0..29e0c8b 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/__init__.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,13 +23,11 @@ from . import engine -from . import sysctl @util.export def createPlugins(context): engine.Plugin(context=context) - sysctl.Plugin(context=context) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/__init__.py b/packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/__init__.py new file mode 100644 index 0000000..8657acc --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/__init__.py @@ -0,0 +1,33 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2014 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-host-remove core plugin.""" + + +from otopi import util + + +from . import sysctl + + +@util.export +def createPlugins(context): + sysctl.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/sysctl.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py rename to packaging/setup/plugins/ovirt-engine-remove/postgresql-server/system/sysctl.py diff --git a/packaging/setup/plugins/ovirt-engine-setup/jboss/config/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/jboss/config/__init__.py new file mode 100644 index 0000000..b94a623 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/jboss/config/__init__.py @@ -0,0 +1,33 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2013 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-host-setup config plugin.""" + + +from otopi import util + + +from . import jboss + + +@util.export +def createPlugins(context): + jboss.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/jboss/config/jboss.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py rename to packaging/setup/plugins/ovirt-engine-setup/jboss/config/jboss.py diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/__init__.py index fbb1549..aba3d20 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/__init__.py @@ -23,13 +23,11 @@ from . import java -from . import jboss @util.export def createPlugins(context): java.Plugin(context=context) - jboss.Plugin(context=context) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py index f114f49..ebe6abc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py @@ -70,11 +70,11 @@ self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-http', - 'directory': 'ovirt-engine' + 'directory': 'jboss' }, { 'name': 'ovirt-https', - 'directory': 'ovirt-engine' + 'directory': 'jboss' }, ]) if self.environment[ @@ -83,11 +83,11 @@ self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-jboss-http', - 'directory': 'ovirt-engine' + 'directory': 'jboss' }, { 'name': 'ovirt-jboss-https', - 'directory': 'ovirt-engine' + 'directory': 'jboss' }, ]) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py index f51ac81..6597d8c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py @@ -161,7 +161,7 @@ self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-postgres', - 'directory': 'ovirt-engine' + 'directory': 'postgresql-server' }, ]) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py index 8d72d1b..9498734 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/__init__.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ from . import engine -from . import sysctl from . import memcheck from . import nfs from . import exportfs @@ -33,7 +32,6 @@ @util.export def createPlugins(context): engine.Plugin(context=context) - sysctl.Plugin(context=context) memcheck.Plugin(context=context) nfs.Plugin(context=context) exportfs.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/__init__.py new file mode 100644 index 0000000..9a97ed3 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/__init__.py @@ -0,0 +1,33 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2014 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-host-setup system plugin.""" + + +from otopi import util + + +from . import sysctl + + +@util.export +def createPlugins(context): + sysctl.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/sysctl.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py rename to packaging/setup/plugins/ovirt-engine-setup/postgresql-server/system/sysctl.py -- To view, visit http://gerrit.ovirt.org/27502 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbcf1ae9e442d9ab3ab11a8fd68bde4ebc69cdad Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
