Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Allow dwh on separate host ......................................................................
packaging: setup: Allow dwh on separate host Change-Id: I06fc960481af258b3954a8968be3439393d3ebdb Bug-Url: https://bugzilla.redhat.com/1080997 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M ovirt-engine-dwh.spec.in M packaging/setup/ovirt_engine_setup/dwhconstants.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/__init__.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/misc.py R packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/__init__.py R packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/connection.py R packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/pgpass.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/__init__.py R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/__init__.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py 12 files changed, 149 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/16/27516/1 diff --git a/ovirt-engine-dwh.spec.in b/ovirt-engine-dwh.spec.in index e5157b7..a81d16b 100644 --- a/ovirt-engine-dwh.spec.in +++ b/ovirt-engine-dwh.spec.in @@ -103,7 +103,6 @@ Requires: java-1.7.0-openjdk Requires: jpackage-utils Requires: logrotate -Requires: ovirt-engine >= 3.5.0 Requires: postgresql-jdbc %description @@ -121,12 +120,21 @@ Summary: %{product_name} setup Group: Virtualization/Management Requires: ovirt-engine-setup-plugin-ovirt-engine-common +Requires: ovirt-engine-setup-plugin-postgresql-server +Requires: %{name}-setup-plugin-common %description setup %{product_description} setup package. %prep %setup -c -q + +%package setup-plugin-common +Summary: %{product_name} Setup and upgrade common plugins +Group: Virtualization/Management + +%description setup-plugin-common +%{product_description} Setup and upgrade common plugins %build make %{make_common_opts} @@ -238,9 +246,12 @@ %endif %files setup -%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/dwh* %{_datadir}/ovirt-engine/setup/plugins/*/ovirt-engine-dwh/ +%files setup-plugin-common +%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/dwh* +%{_datadir}/ovirt-engine/setup/plugins/*/ovirt-engine-dwh-common/ + %changelog * Sun Mar 30 2014 Yaniv Dary <yd...@redhat.com> - 3.4.1 Fixed issues: diff --git a/packaging/setup/ovirt_engine_setup/dwhconstants.py b/packaging/setup/ovirt_engine_setup/dwhconstants.py index 1a92823..398b29e 100644 --- a/packaging/setup/ovirt_engine_setup/dwhconstants.py +++ b/packaging/setup/ovirt_engine_setup/dwhconstants.py @@ -221,6 +221,8 @@ def RESTORE_BACKUP_LATE(self): return 'OVESETUP_DWH_DB/restoreBackupLate' + CREDS_NEEDED = 'OVESETUP_DWH_DB/credsNeeded' + @util.export @util.codegen diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/__init__.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/__init__.py new file mode 100644 index 0000000..ca8ccb8 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/__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-remove core plugin.""" + + +from otopi import util + + +from . import misc + + +@util.export +def createPlugins(context): + misc.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/misc.py new file mode 100644 index 0000000..55268f1 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/core/misc.py @@ -0,0 +1,59 @@ +# +# 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. +# + + +import gettext +_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + +from otopi import util +from otopi import plugin + + +from ovirt_engine_setup import constants as osetupcons +from ovirt_engine_setup import dwhconstants as odwhcons + + +@util.export +class Plugin(plugin.PluginBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault(odwhcons.CoreEnv.ENABLE, None) + + @plugin.event( + stage=plugin.Stages.STAGE_SETUP, + ) + def _setup(self): + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].createGroup( + group='ovirt_dwh_files', + description='DWH files', + optional=True, + ) + self.environment[ + osetupcons.CoreEnv.SETUP_ATTRS_MODULES + ].append(odwhcons) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/__init__.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/__init__.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/__init__.py rename to packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/__init__.py diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/connection.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py rename to packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/connection.py diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/pgpass.py similarity index 100% rename from packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py rename to packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh-common/db/pgpass.py diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py index e9bf710..56ccd95 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py @@ -35,25 +35,9 @@ super(Plugin, self).__init__(context=context) @plugin.event( - stage=plugin.Stages.STAGE_INIT, - ) - def _init(self): - self.environment.setdefault(odwhcons.CoreEnv.ENABLE, None) - - @plugin.event( stage=plugin.Stages.STAGE_SETUP, ) def _setup(self): - self.environment[ - osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS - ].createGroup( - group='ovirt_dwh_files', - description='DWH files', - optional=True, - ) - self.environment[ - osetupcons.CoreEnv.SETUP_ATTRS_MODULES - ].append(odwhcons) self.logger.debug( 'dwh version: %s-%s (%s)\n', odwhcons.Const.PACKAGE_NAME, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/__init__.py new file mode 100644 index 0000000..3ad2872 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/__init__.py @@ -0,0 +1,30 @@ +# +# 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. +# + + +from otopi import util + + +from . import connection + + +@util.export +def createPlugins(context): + connection.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/connection.py similarity index 96% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py rename to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/connection.py index b7333a9..1de5267 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh-common/db/connection.py @@ -93,6 +93,12 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault(odwhcons.DBEnv.CREDS_NEEDED, None) + + @plugin.event( stage=plugin.Stages.STAGE_SETUP, ) def _commands(self): @@ -103,7 +109,10 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, name=odwhcons.Stages.DB_CONNECTION_CUSTOMIZATION, - condition=lambda self: self.environment[odwhcons.CoreEnv.ENABLE], + condition=lambda self: ( + self.environment[odwhcons.CoreEnv.ENABLE] or + self.environment[odwhcons.DBEnv.CREDS_NEEDED] + ), before=( osetupcons.Stages.DIALOG_TITLES_E_DATABASE, ), diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/__init__.py index d37eb09..f6fccb7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/__init__.py @@ -19,13 +19,11 @@ from otopi import util -from . import connection from . import schema @util.export def createPlugins(context): - connection.Plugin(context=context) schema.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py index aa004a0..e2045f7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py @@ -152,14 +152,14 @@ stage=plugin.Stages.STAGE_CUSTOMIZATION, priority=plugin.Stages.PRIORITY_LAST, condition=lambda self: self.environment[ - osetupcons.DBEnv.HOST + odwhcons.DBEnv.HOST ] == 'localhost', ) def _customization_firewall(self): self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES].extend([ { 'name': 'ovirt-postgres', - 'directory': 'ovirt-engine' + 'directory': 'postgresql-server' }, ]) -- To view, visit http://gerrit.ovirt.org/27516 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06fc960481af258b3954a8968be3439393d3ebdb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh 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
