Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: refactoring ......................................................................
packaging: setup: refactoring Refactored the rpm packaging and setup code for splitting ovirt-engine-setup in the following packages: - ovirt-engine-setup - ovirt-engine-setup-plugin-ovirt-engine - ovirt-engine-setup-plugin-ovirt-engine-common - ovirt-engine-setup-plugin-websocket-proxy Installing ovirt-engine will pull in all of the above since ovirt-engine is requiring ovirt-engine-websocket-proxy which now requires ovirt-engine-setup-plugin-websocket-proxy. Just installing ovirt-engine-setup-plugin-ovirt-engine-common will let you to have a working engine-setup and engine-cleanup wich actually do nothing usefull. If we drop the dependency on ovirt-engine-websocket-proxy, the package ovirt-engine-setup-plugin-ovirt-engine is able to install ovirt-engine without websocket-proxy support. Adding it and running again engine-setup will allow you to enable that support. This will ease the migration to otopi for ovirt-dwh and ovirt-reports and extracting websocket-proxy to its own package. Change-Id: I572da9cd7b4a2b9e1fdfee4c05e83a0ca31b99bc Related-To: https://bugzilla.redhat.com/967350 Related-To: https://bugzilla.redhat.com/967351 Related-To: https://bugzilla.redhat.com/967356 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M ovirt-engine.spec.in M packaging/setup/plugins/ovirt-engine-common/core/__init__.py A packaging/setup/plugins/ovirt-engine-common/websocket_proxy/__init__.py R packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py M packaging/setup/plugins/ovirt-engine-remove/core/misc.py A packaging/setup/plugins/ovirt-engine-remove/system/__init__.py C packaging/setup/plugins/ovirt-engine-remove/system/engine.py A packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/__init__.py C packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py M packaging/setup/plugins/ovirt-engine-setup/config/__init__.py M packaging/setup/plugins/ovirt-engine-setup/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/system/__init__.py C packaging/setup/plugins/ovirt-engine-setup/system/engine.py A packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/__init__.py R packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py 15 files changed, 247 insertions(+), 90 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/20293/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 570aeb9..449b46e 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -211,7 +211,7 @@ # We can't require exactly the same version and release of the # setup package because it needs to be updated independely as part # of the update process implemented in the engine-upgrade script: -Requires: %{name}-setup >= %{version}-%{release} +Requires: %{name}-setup-plugin-ovirt-engine >= %{version}-%{release} # We can drop these conflicts when # we drop Requires: mod_ssl @@ -325,7 +325,6 @@ %package setup Summary: Setup and upgrade scripts for %{ovirt_product_name_short} Group: %{ovirt_product_group} -Requires: %{name} Requires: %{name}-lib >= %{version}-%{release} Requires: bind-utils Requires: cracklib-python @@ -354,6 +353,21 @@ %pre setup %ovirt_create_user_vdsm %ovirt_create_user_engine + +%package setup-plugin-ovirt-engine +Summary: Setup and upgrade specific plugins for %{ovirt_product_name_short} +Requires: %{name}-setup-plugin-ovirt-engine-common +Requires: %{name} + +%description setup-plugin-ovirt-engine +Setup and upgrade specific plugins for %{ovirt_product_name_short} + +%package setup-plugin-ovirt-engine-common +Summary: Setup and upgrade common plugins for %{ovirt_product_name_short} +Requires: %{name}-setup + +%description setup-plugin-ovirt-engine-common +Setup and upgrade common plugins for %{ovirt_product_name_short} %package dbscripts Summary: Database scripts for %{ovirt_product_name_short} @@ -442,6 +456,7 @@ Requires: %{name}-lib >= %{version}-%{release} Requires: m2crypto Requires: python-websockify +Requires: %{name}-setup-plugin-websocket-proxy >= %{version}-%{release} %if %{ovirt_install_systemd} Requires(post): systemd @@ -476,11 +491,19 @@ fi %endif +%package setup-plugin-websocket-proxy +Summary: Setup and upgrade specific plugins for websocket-proxy +Requires: %{name}-setup-plugin-ovirt-engine-common + +%description setup-plugin-websocket-proxy +Setup and upgrade specific plugins for websocket-proxy + + %package setup-plugin-allinone Summary: All-in-one plugin for %{ovirt_product_name_short}'s setup Group: %{ovirt_product_group} Requires: %{name}-sdk >= 3.3.0.5 -Requires: %{name}-setup >= %{version}-%{release} +Requires: %{name}-setup-plugin-ovirt-engine >= %{version}-%{release} Requires: openssh-server Requires: ovirt-host-deploy >= 1.1.1-1 Requires: ovirt-host-deploy-offline >= 1.1.1-1 @@ -829,18 +852,13 @@ %{_mandir}/man8/engine-setup.* %{engine_data}/bin/engine-backup.sh %{engine_data}/bin/ovirt-engine-log-setup-event.sh -%{engine_data}/conf/iptables.default.in -%{engine_data}/conf/nfs.sysconfig.in -%{engine_data}/conf/ovirt-engine-proxy.conf.v2.in -%{engine_data}/conf/ovirt-engine-root-redirect.conf.in -%{engine_data}/firewalld/base/ -%{engine_data}/setup/ +%{engine_data}/setup/bin/ovirt-engine-remove +%{engine_data}/setup/bin/ovirt-engine-setup +%{engine_data}/setup/bin/ovirt-engine-setup.env +%{engine_data}/setup/bin/ovirt-engine-upgrade-check + %{engine_state}/backups/ %{engine_state}/setup/ - -# backward compatibility -%ghost %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml - # Legacy # TODO: remove in 3.4 %{_bindir}/engine-check-update @@ -848,6 +866,54 @@ %{engine_data}/bin/engine-check-update.sh %{engine_data}/bin/engine-upgrade.sh +%files setup-plugin-ovirt-engine + +# backward compatibility +%ghost %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml +%{engine_data}/conf/iptables.default.in +%{engine_data}/conf/nfs.sysconfig.in +%{engine_data}/conf/ovirt-engine-proxy.conf.v2.in +%{engine_data}/conf/ovirt-engine-root-redirect.conf.in +%{engine_data}/firewalld/base/ +%{engine_data}/setup/bin/ovirt-engine-rename +%{engine_data}/setup/dbutils/ +%{engine_data}/setup/plugins/ovirt-engine-setup/all-in-one/ +%{engine_data}/setup/plugins/ovirt-engine-setup/apache/ +%{engine_data}/setup/plugins/ovirt-engine-setup/config/ +%{engine_data}/setup/plugins/ovirt-engine-setup/db/ +%{engine_data}/setup/plugins/ovirt-engine-setup/dialog/ +%{engine_data}/setup/plugins/ovirt-engine-setup/distro-rpm/ +%{engine_data}/setup/plugins/ovirt-engine-setup/legacy/ +%{engine_data}/setup/plugins/ovirt-engine-setup/network/ +%{engine_data}/setup/plugins/ovirt-engine-setup/pki/ +%{engine_data}/setup/plugins/ovirt-engine-setup/provisioning/ +%{engine_data}/setup/plugins/ovirt-engine-setup/system/ +%{engine_data}/setup/plugins/ovirt-engine-setup/upgrade/ +%{engine_data}/setup/plugins/ovirt-engine-remove/config/ +%{engine_data}/setup/plugins/ovirt-engine-remove/db/ +%{engine_data}/setup/plugins/ovirt-engine-remove/files/ +%{engine_data}/setup/plugins/ovirt-engine-remove/network/ +%{engine_data}/setup/plugins/ovirt-engine-remove/system/ +%{engine_data}/setup/plugins/ovirt-engine-rename/ + +%files setup-plugin-ovirt-engine-common + +%{engine_data}/setup/ovirt_engine_setup/ +%{engine_data}/setup/plugins/ovirt-engine-common/core/ +%{engine_data}/setup/plugins/ovirt-engine-common/db/ +%{engine_data}/setup/plugins/ovirt-engine-common/dialog/ +%{engine_data}/setup/plugins/ovirt-engine-common/distro-rpm/ +%{engine_data}/setup/plugins/ovirt-engine-common/system/ +%{engine_data}/setup/plugins/ovirt-engine-setup/core/ +%{engine_data}/setup/plugins/ovirt-engine-remove/core/ + +%files setup-plugin-websocket-proxy + +%{engine_data}/firewalld/base/ovirt-websocket-proxy.xml.in +%{engine_data}/setup/plugins/ovirt-engine-common/websocket_proxy/ +%{engine_data}/setup/plugins/ovirt-engine-setup/websocket_proxy/ +%{engine_data}/setup/plugins/ovirt-engine-remove/websocket_proxy/ + %files setup-plugin-allinone %config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-aio.conf diff --git a/packaging/setup/plugins/ovirt-engine-common/core/__init__.py b/packaging/setup/plugins/ovirt-engine-common/core/__init__.py index aca7057..43075e4 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-common/core/__init__.py @@ -25,7 +25,6 @@ from . import offlinepackager from . import misc from . import engine -from . import websocket_proxy from . import answerfile from . import uninstall from . import protocols @@ -37,7 +36,6 @@ offlinepackager.Plugin(context=context) misc.Plugin(context=context) engine.Plugin(context=context) - websocket_proxy.Plugin(context=context) answerfile.Plugin(context=context) uninstall.Plugin(context=context) protocols.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/__init__.py b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/__init__.py new file mode 100644 index 0000000..ceb00b5 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/__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 websocket_proxy plugin.""" + + +from otopi import util + + +from . import core + + +@util.export +def createPlugins(context): + core.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py similarity index 95% rename from packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py rename to packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py index cd6c4e2..c5d263a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py @@ -27,6 +27,7 @@ from otopi import plugin +#TODO: migrate websocket related constants to its own module. from ovirt_engine_setup import constants as osetupcons diff --git a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py index 46151fb..7eb32e7 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py @@ -152,22 +152,6 @@ ) @plugin.event( - stage=plugin.Stages.STAGE_MISC, - condition=lambda self: not self.environment[ - osetupcons.CoreEnv.DEVELOPER_MODE - ], - ) - def _misc(self): - self.services.startup( - name=osetupcons.Const.ENGINE_SERVICE_NAME, - state=False, - ) - self.services.startup( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - state=False, - ) - - @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, before=( osetupcons.Stages.DIALOG_TITLES_E_SUMMARY, diff --git a/packaging/setup/plugins/ovirt-engine-remove/system/__init__.py b/packaging/setup/plugins/ovirt-engine-remove/system/__init__.py new file mode 100644 index 0000000..1281678 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-remove/system/__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 engine + + +@util.export +def createPlugins(context): + engine.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-remove/system/engine.py similarity index 70% copy from packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py copy to packaging/setup/plugins/ovirt-engine-remove/system/engine.py index cd6c4e2..4d09da2 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-remove/system/engine.py @@ -16,7 +16,7 @@ # -"""websocket proxy plugin.""" +"""Engine plugin.""" import gettext @@ -32,26 +32,22 @@ @util.export class Plugin(plugin.PluginBase): - """websocket proxy plugin.""" + """Engine plugin.""" def __init__(self, context): super(Plugin, self).__init__(context=context) @plugin.event( - stage=plugin.Stages.STAGE_TRANSACTION_BEGIN, + stage=plugin.Stages.STAGE_MISC, condition=lambda self: not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ], ) - def _transactionBegin(self): - if self.services.exists( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - ): - self.logger.info(_('Stopping websocket-proxy service')) - self.services.state( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - state=False - ) + def _misc(self): + self.services.startup( + name=osetupcons.Const.ENGINE_SERVICE_NAME, + state=False, + ) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/__init__.py b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/__init__.py new file mode 100644 index 0000000..2dd2f50 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/__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 websocket_proxy 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/core/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py similarity index 68% copy from packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py copy to packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py index cd6c4e2..e5dd390 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py @@ -16,7 +16,7 @@ # -"""websocket proxy plugin.""" +"""Websocket-proxy plugin.""" import gettext @@ -32,26 +32,19 @@ @util.export class Plugin(plugin.PluginBase): - """websocket proxy plugin.""" - - def __init__(self, context): - super(Plugin, self).__init__(context=context) + """Websocket-proxy plugin.""" @plugin.event( - stage=plugin.Stages.STAGE_TRANSACTION_BEGIN, + stage=plugin.Stages.STAGE_MISC, condition=lambda self: not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ], ) - def _transactionBegin(self): - if self.services.exists( + def _misc(self): + self.services.startup( name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - ): - self.logger.info(_('Stopping websocket-proxy service')) - self.services.state( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - state=False - ) + state=False, + ) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/config/__init__.py index 4eb1f37..635d598 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/__init__.py @@ -34,7 +34,6 @@ from . import tools from . import iso_domain from . import macrange -from . import websocket_proxy from . import productkey_upgrade @@ -52,7 +51,6 @@ tools.Plugin(context=context) iso_domain.Plugin(context=context) macrange.Plugin(context=context) - websocket_proxy.Plugin(context=context) productkey_upgrade.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py index 4c122b4..184b1e2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py @@ -61,7 +61,9 @@ ) def _init(self): if ( - self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY] or + self.environment.get( + osetupcons.CoreEnv.UPGRADE_FROM_LEGACY, False + ) or os.path.exists( osetupcons.FileLocations.OVIRT_SETUP_POST_INSTALL_CONFIG ) @@ -73,24 +75,6 @@ self.environment[ osetupcons.CoreEnv.ACTION ] = osetupcons.Const.ACTION_SETUP - - @plugin.event( - stage=plugin.Stages.STAGE_CLOSEUP, - name=osetupcons.Stages.CORE_ENGINE_START, - condition=lambda self: not self.environment[ - osetupcons.CoreEnv.DEVELOPER_MODE - ], - ) - def _closeup(self): - self.logger.info(_('Starting engine service')) - self.services.state( - name=osetupcons.Const.ENGINE_SERVICE_NAME, - state=True, - ) - self.services.startup( - name=osetupcons.Const.ENGINE_SERVICE_NAME, - state=True, - ) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/system/__init__.py index 0d9928f..7573d45 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/system/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/system/__init__.py @@ -22,6 +22,7 @@ from otopi import util +from . import engine from . import sysctl from . import memcheck from . import nfs @@ -32,6 +33,7 @@ @util.export def createPlugins(context): + engine.Plugin(context=context) sysctl.Plugin(context=context) memcheck.Plugin(context=context) nfs.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-setup/system/engine.py similarity index 70% copy from packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py copy to packaging/setup/plugins/ovirt-engine-setup/system/engine.py index cd6c4e2..1d93382 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/system/engine.py @@ -16,7 +16,7 @@ # -"""websocket proxy plugin.""" +"""Engine service plugin.""" import gettext @@ -32,26 +32,28 @@ @util.export class Plugin(plugin.PluginBase): - """websocket proxy plugin.""" + """Engine service plugin.""" def __init__(self, context): super(Plugin, self).__init__(context=context) @plugin.event( - stage=plugin.Stages.STAGE_TRANSACTION_BEGIN, + stage=plugin.Stages.STAGE_CLOSEUP, + name=osetupcons.Stages.CORE_ENGINE_START, condition=lambda self: not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ], ) - def _transactionBegin(self): - if self.services.exists( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - ): - self.logger.info(_('Stopping websocket-proxy service')) - self.services.state( - name=osetupcons.Const.WEBSOCKET_PROXY_SERVICE_NAME, - state=False - ) + def _closeup(self): + self.logger.info(_('Starting engine service')) + self.services.state( + name=osetupcons.Const.ENGINE_SERVICE_NAME, + state=True, + ) + self.services.startup( + name=osetupcons.Const.ENGINE_SERVICE_NAME, + state=True, + ) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/__init__.py new file mode 100644 index 0000000..53aa4f7 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/__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 websocket_proxy plugin.""" + + +from otopi import util + + +from . import config + + +@util.export +def createPlugins(context): + config.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py similarity index 98% rename from packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py rename to packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py index 92f0774..aa46d5c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/websocket_proxy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py @@ -30,6 +30,7 @@ from otopi import plugin +#TODO: migrate websocket related constants to its own module. from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import dialog -- To view, visit http://gerrit.ovirt.org/20293 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I572da9cd7b4a2b9e1fdfee4c05e83a0ca31b99bc 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
