Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: move postinstall to common
......................................................................
packaging: setup: move postinstall to common
this will enable us to save the state after re-execution of setup for
any reason.
Change-Id: Ie9c67236ee02c5aa4d9bcb37c8e525f515aa9193
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-common/core/__init__.py
R packaging/setup/plugins/ovirt-engine-common/core/postinstall.py
M packaging/setup/plugins/ovirt-engine-remove/core/misc.py
M packaging/setup/plugins/ovirt-engine-rename/core/__init__.py
D packaging/setup/plugins/ovirt-engine-rename/core/postinstall.py
M packaging/setup/plugins/ovirt-engine-setup/core/__init__.py
7 files changed, 18 insertions(+), 95 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/18318/1
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index 7493bb9..a87f54e 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -622,6 +622,7 @@
ANSWER_FILE = 'OVESETUP_CORE/answerFile'
DEVELOPER_MODE = 'OVESETUP_CORE/developerMode'
UNINSTALL_UNREMOVABLE_FILES = 'OVESETUP_CORE/uninstallUnremovableFiles'
+ GENERATE_POSTINSTALL = 'OVESETUP_CORE/generatePostInstall'
FILE_GROUP_PREFIX = 'OVESETUP_CORE_MODIFIED_FILE_GROUP/'
LINES_GROUP_PREFIX = 'OVESETUP_CORE_MODIFIED_LINES_GROUP/'
REGISTER_UNINSTALL_GROUPS = 'OVESETUP_CORE/registerUninstallGroups'
diff --git a/packaging/setup/plugins/ovirt-engine-common/core/__init__.py
b/packaging/setup/plugins/ovirt-engine-common/core/__init__.py
index e900a2c..aca7057 100644
--- a/packaging/setup/plugins/ovirt-engine-common/core/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-common/core/__init__.py
@@ -29,6 +29,7 @@
from . import answerfile
from . import uninstall
from . import protocols
+from . import postinstall
@util.export
@@ -40,6 +41,7 @@
answerfile.Plugin(context=context)
uninstall.Plugin(context=context)
protocols.Plugin(context=context)
+ postinstall.Plugin(context=context)
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/postinstall.py
b/packaging/setup/plugins/ovirt-engine-common/core/postinstall.py
similarity index 90%
rename from packaging/setup/plugins/ovirt-engine-setup/core/postinstall.py
rename to packaging/setup/plugins/ovirt-engine-common/core/postinstall.py
index bb1157d..046694c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/core/postinstall.py
+++ b/packaging/setup/plugins/ovirt-engine-common/core/postinstall.py
@@ -41,8 +41,17 @@
super(Plugin, self).__init__(context=context)
@plugin.event(
+ stage=plugin.Stages.STAGE_INIT,
+ )
+ def _init(self):
+ self.environment[osetupcons.CoreEnv.GENERATE_POSTINSTALL] = True
+
+ @plugin.event(
stage=plugin.Stages.STAGE_MISC,
priority=plugin.Stages.PRIORITY_LAST,
+ condition=lambda self: self.environment[
+ osetupcons.CoreEnv.GENERATE_POSTINSTALL
+ ],
)
def _misc(self):
self.logger.info(
diff --git a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
index 5e1be0a..d9a8935 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
@@ -72,6 +72,12 @@
)
@plugin.event(
+ stage=plugin.Stages.STAGE_SETUP,
+ )
+ def _setup(self):
+ self.environment[osetupcons.CoreEnv.GENERATE_POSTINSTALL] = False
+
+ @plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
name=osetupcons.Stages.REMOVE_CUSTOMIZATION_COMMON,
)
diff --git a/packaging/setup/plugins/ovirt-engine-rename/core/__init__.py
b/packaging/setup/plugins/ovirt-engine-rename/core/__init__.py
index 8a4c31a..50ccf86 100644
--- a/packaging/setup/plugins/ovirt-engine-rename/core/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-rename/core/__init__.py
@@ -26,7 +26,6 @@
from . import engine
from . import misc
from . import pki
-from . import postinstall
from . import protocols
from . import tools
from . import uninstall
@@ -38,7 +37,6 @@
engine.Plugin(context=context)
misc.Plugin(context=context)
pki.Plugin(context=context)
- postinstall.Plugin(context=context)
protocols.Plugin(context=context)
tools.Plugin(context=context)
uninstall.Plugin(context=context)
diff --git a/packaging/setup/plugins/ovirt-engine-rename/core/postinstall.py
b/packaging/setup/plugins/ovirt-engine-rename/core/postinstall.py
deleted file mode 100644
index a389e56..0000000
--- a/packaging/setup/plugins/ovirt-engine-rename/core/postinstall.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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.
-#
-
-# Copied from packaging/setup/plugins/ovirt-engine-setup/core/postinstall.py
-# Changes:
-# - set FQDN
-# TODO: Merge
-
-"""post install config file plugin."""
-
-
-import gettext
-_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup')
-
-
-from otopi import util
-from otopi import plugin
-from otopi import constants as otopicons
-from otopi import filetransaction
-
-
-from ovirt_engine_setup import constants as osetupcons
-
-
-@util.export
-class Plugin(plugin.PluginBase):
- """post install config file plugin."""
-
- def __init__(self, context):
- super(Plugin, self).__init__(context=context)
-
- @plugin.event(
- stage=plugin.Stages.STAGE_SETUP,
- )
- def _setup(self):
- self.environment[
- osetupcons.RenameEnv.FILES_TO_BE_MODIFIED
- ].append(
- osetupcons.FileLocations.
- OVIRT_SETUP_POST_INSTALL_CONFIG
- )
-
- @plugin.event(
- stage=plugin.Stages.STAGE_MISC,
- )
- def _misc(self):
- config = (
- osetupcons.FileLocations.
- OVIRT_SETUP_POST_INSTALL_CONFIG
- )
-
- with open(config, 'r') as f:
- content = []
- for line in f:
- line = line.rstrip('\n')
- if line.startswith('OVESETUP_CONFIG/fqdn='):
- line = (
- 'OVESETUP_CONFIG/fqdn=str:%s'
- ) % (
- self.environment[
- osetupcons.RenameEnv.FQDN
- ],
- )
- content.append(line)
-
- self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
- filetransaction.FileTransaction(
- name=config,
- content=content,
- modifiedList=self.environment[
- otopicons.CoreEnv.MODIFIED_FILES
- ],
- )
- )
-
-
-# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/__init__.py
b/packaging/setup/plugins/ovirt-engine-setup/core/__init__.py
index 1971108..3b164aa 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/core/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/core/__init__.py
@@ -23,13 +23,11 @@
from . import misc
-from . import postinstall
@util.export
def createPlugins(context):
misc.Plugin(context=context)
- postinstall.Plugin(context=context)
# vim: expandtab tabstop=4 shiftwidth=4
--
To view, visit http://gerrit.ovirt.org/18318
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9c67236ee02c5aa4d9bcb37c8e525f515aa9193
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
