Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: allow pki files removal ......................................................................
packaging: setup: allow pki files removal Allow pki files removal using engine-cleanup-2 after upgrading from legacy using engine-setup-2 Change-Id: Ib02123e8757fa7664c4df3e50b22019d0acb7597 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/legacy/__init__.py A packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py 2 files changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/16603/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/__init__.py index fc7d425..d246096 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/legacy/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/__init__.py @@ -29,6 +29,7 @@ from . import firewall_manager from . import isodomain from . import database +from . import ca @util.export @@ -40,6 +41,7 @@ firewall_manager.Plugin(context=context) isodomain.Plugin(context=context) database.Plugin(context=context) + ca.Plugin(context=context) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py new file mode 100644 index 0000000..57d7620 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py @@ -0,0 +1,77 @@ +# +# 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. +# + + +"""Allow CA pki cleanup on upgrade from legacy plugin.""" + + +import os +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 + + [email protected] +class Plugin(plugin.PluginBase): + """Allow CA pki cleanup on upgrade from legacy plugin.""" + + def __init__(self, context): + super(Plugin, self).__init__(context=context) + + @plugin.event( + stage=plugin.Stages.STAGE_MISC, + condition=lambda self: ( + self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY] + ), + ) + def _misc(self): + uninstall_files = [] + for name in ( + osetupcons.FileLocations. + OVIRT_ENGINE_PKI_CA_TEMPLATE[:-len('.in')], + osetupcons.FileLocations. + OVIRT_ENGINE_PKI_CERT_TEMPLATE[:-len('.in')], + osetupcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_STORE, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_KEY, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CERT, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_STORE, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_TRUST_STORE, + osetupcons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE, + ): + if os.path.exists(name): + uninstall_files.append(name) + + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].createGroup( + group='ca_pki', + description='PKI keys', + optional=True, + ).addFiles( + group='ca_pki', + fileList=uninstall_files, + ) + +# vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/16603 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib02123e8757fa7664c4df3e50b22019d0acb7597 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
