Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: making apache configuration dependent from
engine one
......................................................................
packaging: setup: making apache configuration dependent from engine one
Enabling apache configuration only if the user decide to configure the engine
Change-Id: I904540e73b19795ccb9f603960cac122e404fc6f
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
D packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py
3 files changed, 3 insertions(+), 49 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/29202/1
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
index c01d1d2..30311b1 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
@@ -22,13 +22,11 @@
from otopi import util
-from . import core
from . import engine
@util.export
def createPlugins(context):
- core.Plugin(context=context)
engine.Plugin(context=context)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py
deleted file mode 100644
index b1de037..0000000
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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.
-#
-
-
-"""Apache enable plugin."""
-
-
-import gettext
-_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup')
-
-
-from otopi import util
-from otopi import plugin
-
-
-from ovirt_engine_setup.engine_common import constants as oengcommcons
-
-
-@util.export
-class Plugin(plugin.PluginBase):
- """Apache enable plugin."""
-
- def __init__(self, context):
- super(Plugin, self).__init__(context=context)
-
- @plugin.event(
- stage=plugin.Stages.STAGE_INIT,
- )
- def _init(self):
- self.environment[oengcommcons.ApacheEnv.ENABLE] = True
-
-
-# vim: expandtab tabstop=4 shiftwidth=4
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py
index f11d16f..8adce19 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py
@@ -30,6 +30,7 @@
from ovirt_engine_setup import dialog
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
@util.export
@@ -70,6 +71,8 @@
prompt=True,
default=True,
)
+ if self.environment[oenginecons.CoreEnv.ENABLE]:
+ self.environment[oengcommcons.ApacheEnv.ENABLE] = True
# vim: expandtab tabstop=4 shiftwidth=4
--
To view, visit http://gerrit.ovirt.org/29202
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I904540e73b19795ccb9f603960cac122e404fc6f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
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
