diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 150b818fe6f..3d68cd45db5 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -383,8 +383,6 @@ class SystemEnv(object): @osetupattrsclass class ConfigEnv(object): - ADD_OVIRT_GLANCE_REPOSITORY = 'OVESETUP_CONFIG/addOvirtGlanceRepository' - @osetupattrs( answerfile=True, summary=True, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/__init__.py index e40fefe2ed6..a7a46829aca 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/__init__.py @@ -28,7 +28,6 @@ from . import notifier from . import options from . import protocols -from . import public_glance_repository from . import sso from . import storage from . import tools @@ -51,7 +50,6 @@ def createPlugins(context): ca.Plugin(context=context) options.Plugin(context=context) tools.Plugin(context=context) - public_glance_repository.Plugin(context=context) storage.Plugin(context=context) sso.Plugin(context=context) notifier.Plugin(context=context) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py deleted file mode 100644 index d0ab85b6aa6..00000000000 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py +++ /dev/null @@ -1,74 +0,0 @@ -# -# ovirt-engine-setup -- ovirt engine setup -# -# Copyright oVirt Authors -# SPDX-License-Identifier: Apache-2.0 -# -# - - -"""Plugin to add the oVirt public Glance repository.""" - - -import gettext - -from otopi import plugin -from otopi import util - -from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common import constants as oengcommcons - - -def _(m): - return gettext.dgettext(message=m, domain='ovirt-engine-setup') - - -@util.export -class Plugin(plugin.PluginBase): - """Plugin to add the oVirt public Glance repository.""" - - def __init__(self, context): - super(Plugin, self).__init__(context=context) - - @plugin.event( - stage=plugin.Stages.STAGE_INIT, - ) - def _init(self): - self.environment.setdefault( - osetupcons.ConfigEnv.ADD_OVIRT_GLANCE_REPOSITORY, - True, - ) - - @plugin.event( - stage=plugin.Stages.STAGE_MISC, - after=( - oengcommcons.Stages.DB_CONNECTION_AVAILABLE, - ), - condition=lambda self: ( - self.environment[oenginecons.CoreEnv.ENABLE] and - self.environment[osetupcons.ConfigEnv.ADD_OVIRT_GLANCE_REPOSITORY] - ) - ) - def _misc(self): - self.environment[oenginecons.EngineDBEnv.STATEMENT].execute( - statement=""" - select inst_add_glance_provider( - %(provider_id)s, - %(provider_name)s, - %(provider_description)s, - %(provider_url)s, - %(storage_domain_id)s - ) - """, - args=dict( - provider_id="ceab03af-7220-4d42-8f5c-9b557f5d29af", - provider_name="ovirt-image-repository", - provider_description="Public Glance repository for oVirt", - provider_url="http://glance.ovirt.org:9292", - storage_domain_id="072fbaa1-08f3-4a40-9f34-a5ca22dd1d74" - ), - ) - - -# vim: expandtab tabstop=4 shiftwidth=4