Simone Tiraboschi has uploaded a new change for review. Change subject: dwh: Split of engine-setup-plugin ......................................................................
dwh: Split of engine-setup-plugin Update includes and constants packages due to changes on constant packages in engine-setup for engine setup split. Move constants files to the right position to adopt the same schema. This patch depends from: http://gerrit.ovirt.org/#/c/27647/ from ovirt-engine project Change-Id: I1e53dd09940697fe6ef73ed63ef4369e73b02c42 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> --- M Makefile M ovirt-engine-dwh.spec.in A packaging/setup/ovirt_engine_setup/dwh/__init__.py R packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py.in R packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/__init__.py A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/environment.py 22 files changed, 203 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/42/28242/1 diff --git a/Makefile b/Makefile index cccd91c..a97d5c6 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.systemd \ packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.sysv \ packaging/services/ovirt-engine-dwhd/ovirt_engine_dwh_watchdog.cron \ - packaging/setup/ovirt_engine_setup/dwhconfig.py \ + packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py \ packaging/sys-etc/logrotate.d/ovirt-engine-dwhd \ $(NULL) diff --git a/ovirt-engine-dwh.spec.in b/ovirt-engine-dwh.spec.in index d961ede..284c29e 100644 --- a/ovirt-engine-dwh.spec.in +++ b/ovirt-engine-dwh.spec.in @@ -238,7 +238,8 @@ %endif %files setup -%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/dwh* +%dir %{_datadir}/ovirt-engine/setup/ovirt_engine_setup/dwh/ +%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/dwh/ %{_datadir}/ovirt-engine/setup/plugins/*/ovirt-engine-dwh/ %changelog diff --git a/packaging/setup/ovirt_engine_setup/dwh/__init__.py b/packaging/setup/ovirt_engine_setup/dwh/__init__.py new file mode 100644 index 0000000..74cb8e6 --- /dev/null +++ b/packaging/setup/ovirt_engine_setup/dwh/__init__.py @@ -0,0 +1,25 @@ +# +# 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_engine_setup module.""" + + +__all__ = [] + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/ovirt_engine_setup/dwhconfig.py.in b/packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py.in similarity index 100% rename from packaging/setup/ovirt_engine_setup/dwhconfig.py.in rename to packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py.in diff --git a/packaging/setup/ovirt_engine_setup/dwhconstants.py b/packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py similarity index 96% rename from packaging/setup/ovirt_engine_setup/dwhconstants.py rename to packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py index 56b41a0..4403543 100644 --- a/packaging/setup/ovirt_engine_setup/dwhconstants.py +++ b/packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py @@ -16,7 +16,7 @@ # -"""Constants.""" +"""DWH Constants.""" import os @@ -75,6 +75,8 @@ DEFAULT_DB_SECURED = False DEFAULT_DB_SECURED_HOST_VALIDATION = False + DEFAULT_SYSTEM_USER_DWH = 'ovirt' + DEFAULT_SYSTEM_GROUP_DWH = 'ovirt' @util.export @util.codegen @@ -254,4 +256,12 @@ PACKAGES_SETUP = 'OVESETUP_DWH_RPMDISRO_PACKAGES_SETUP' +@util.export +@util.codegen +@osetupattrsclass +class SystemEnv(object): + USER_DWH = 'OVESETUP_SYSTEM/userDwh' + GROUP_DWH = 'OVESETUP_SYSTEM/groupDwh' + + # vim: expandtab tabstop=4 shiftwidth=4 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..e003c92 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 @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py index f3ff4fc..79b4502 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons @util.export 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/db/connection.py index c4d9965..33bd46c 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py @@ -32,8 +32,8 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database @util.export @@ -126,7 +126,8 @@ (odwhcons.DBEnv.DATABASE, 'DWH_DB_DATABASE'), ): dbenv[e] = ( - self.environment.get(e) if self.environment.get(e) is not None + self.environment.get(e) + if self.environment.get(e) is not None else config.get(k) ) for e, k in ( 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/db/pgpass.py index 4edece6..95d6519 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py @@ -27,8 +27,8 @@ from otopi import plugin -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py index 7c0ce31..20d2061 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py index ae64cc6..654d75d 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py @@ -28,8 +28,8 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py index c182cc7..e986ead 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py @@ -25,10 +25,10 @@ from otopi import plugin -from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import dialog -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -63,12 +63,14 @@ stage=plugin.Stages.STAGE_VALIDATION, condition=lambda self: ( self.environment[odwhcons.CoreEnv.ENABLE] and - not self.environment[osetupcons.DBEnv.NEW_DATABASE] + not self.environment[oengcommcons.EngineDBEnv.NEW_DATABASE] + # TODO: ES: check what should happen + # when the Engine is on a different host ), ) def _validation(self): statement = database.Statement( - dbenvkeys=osetupcons.Const.ENGINE_DB_ENV_KEYS, + dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS, environment=self.environment, ) minimalVersion = statement.getVdcOption( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py index 706f145..124b950 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py @@ -33,7 +33,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -114,19 +116,31 @@ OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DATABASE ), mode=0o600, - owner=self.environment[osetupcons.SystemEnv.USER_ENGINE], + owner=self.environment[odwhcons.SystemEnv.USER_DWH], enforcePermissions=True, content='%s%s' % ( self._getDBConfig( prefix='ENGINE', - host=self.environment[osetupcons.DBEnv.HOST], - port=self.environment[osetupcons.DBEnv.PORT], - user=self.environment[osetupcons.DBEnv.USER], - password=self.environment[osetupcons.DBEnv.PASSWORD], - database=self.environment[osetupcons.DBEnv.DATABASE], - secured=self.environment[osetupcons.DBEnv.SECURED], + host=self.environment[ + oengcommcons.EngineDBEnv.HOST + ], + port=self.environment[ + oengcommcons.EngineDBEnvPORT + ], + user=self.environment[ + oengcommcons.EngineDBEnvUSER + ], + password=self.environment[ + oengcommcons.EngineDBEnvPASSWORD + ], + database=self.environment[ + oengcommcons.EngineDBEnvDATABASE + ], + secured=self.environment[ + oengcommcons.EngineDBEnvSECURED + ], hostValidation=self.environment[ - osetupcons.DBEnv.SECURED_HOST_VALIDATION + oengcommcons.EngineDBEnv.SECURED_HOST_VALIDATION ], ), self._getDBConfig( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py index f907b4f..12b0cf4 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py index 35f9c5b..5f586ae 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons @util.export 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/db/connection.py index b7333a9..8a1f2e9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py @@ -30,11 +30,12 @@ from otopi import plugin -from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog from ovirt_engine_setup import util as osetuputil +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -105,10 +106,10 @@ name=odwhcons.Stages.DB_CONNECTION_CUSTOMIZATION, condition=lambda self: self.environment[odwhcons.CoreEnv.ENABLE], before=( - osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, ), after=( - osetupcons.Stages.DIALOG_TITLES_S_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, ), ) def _customization(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py index 3ab8b53..a0565e0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py @@ -31,9 +31,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -128,7 +130,7 @@ '-t {user}' ).format( cmd=( - osetupcons.FileLocations. + oengcommcons.FileLocations. OVIRT_ENGINE_DB_CHANGE_OWNER ), server=self.environment[odwhcons.DBEnv.HOST], @@ -219,7 +221,7 @@ odwhcons.DBEnv.NEW_DATABASE ], before=( - osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, ), after=( odwhcons.Stages.DB_CONNECTION_CUSTOMIZATION, @@ -356,16 +358,16 @@ osetupcons.CoreEnv.DEVELOPER_MODE ]: if not os.path.exists( - osetupcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR + oengcommcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR ): os.makedirs( - osetupcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR + oengcommcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR ) args.extend( [ '-m', os.path.join( - osetupcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR, + oengcommcons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR, '%s-%s.scripts.md5' % ( self.environment[odwhcons.DBEnv.HOST], self.environment[odwhcons.DBEnv.DATABASE], diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py index 0c19bc2..fa3d8d5 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py index 8658483..21a0ea8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py @@ -35,8 +35,8 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons -from ovirt_engine_setup import database +from ovirt_engine_setup.dwh import dwhconstants as odwhcons +from ovirt_engine_setup.engine_common import database @util.export 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..181c38c 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 @@ -28,9 +28,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dwhconstants as odwhcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons from ovirt_engine_setup import dialog -from ovirt_engine_setup import postgres +from ovirt_engine_setup.engine_common import postgres +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -87,11 +89,11 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, before=( - osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, odwhcons.Stages.DB_CONNECTION_CUSTOMIZATION, ), after=( - osetupcons.Stages.DIALOG_TITLES_S_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, odwhcons.Stages.CORE_ENABLE, ), condition=lambda self: self._enabled, @@ -152,7 +154,7 @@ 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): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/__init__.py new file mode 100644 index 0000000..ca38824 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/__init__.py @@ -0,0 +1,30 @@ +# +# 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. +# + + +from otopi import util + + +from . import environment + + +@util.export +def createPlugins(context): + environment.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/environment.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/environment.py new file mode 100644 index 0000000..055d360 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/system/environment.py @@ -0,0 +1,65 @@ +# +# 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. +# + + +"""Environment plugin.""" + + +import grp +import os +import pwd +import gettext +_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') + + +from otopi import util +from otopi import plugin + + +from ovirt_engine_setup import constants as osetupcons +from ovirt_engine_setup.dwh import dwhconstants as odwhcons + + +@util.export +class Plugin(plugin.PluginBase): + """Environment plugin.""" + + def __init__(self, context): + super(Plugin, self).__init__(context=context) + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + if self.environment[osetupcons.CoreEnv.DEVELOPER_MODE]: + dwhUser = pwd.getpwuid(os.geteuid())[0] + dwhGroup = grp.getgrgid(os.getegid())[0] + else: + dwhUser = odwhcons.Defaults.DEFAULT_SYSTEM_USER_DWH + dwhGroup = odwhcons.Defaults.DEFAULT_SYSTEM_GROUP_DWH + + self.environment.setdefault( + odwhcons.SystemEnv.USER_DWH, + dwhUser + ) + self.environment.setdefault( + odwhcons.SystemEnv.GROUP_DWH, + dwhGroup + ) + + +# vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/28242 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e53dd09940697fe6ef73ed63ef4369e73b02c42 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh 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
