Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: adding DOCKERC_NEEDED
......................................................................
packaging: setup: adding DOCKERC_NEEDED
Adding DOCKERC_NEEDED to enable dockerc related code under
engine-common only if really needed
Change-Id: I587c403072a4c2b690ed8fdadbfb386dbdde829f
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/engine_common/constants.py
M packaging/setup/plugins/ovirt-engine-common/dockerc/core.py
M packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
M packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
4 files changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/42405/1
diff --git a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
index 79ad802..b07f416 100644
--- a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
+++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
@@ -267,6 +267,7 @@
JBOSS_DEBUG_ADDRESS = 'OVESETUP_CONFIG/jbossDebugAddress'
JBOSS_NEEDED = 'OVESETUP_CONFIG/jbossNeeded'
JAVA_NEEDED = 'OVESETUP_CONFIG/javaNeeded'
+ DOCKERC_NEEDED = 'OVESETUP_CONFIG/dockercNeeded'
@util.export
diff --git a/packaging/setup/plugins/ovirt-engine-common/dockerc/core.py
b/packaging/setup/plugins/ovirt-engine-common/dockerc/core.py
index d3e8357..b539977 100644
--- a/packaging/setup/plugins/ovirt-engine-common/dockerc/core.py
+++ b/packaging/setup/plugins/ovirt-engine-common/dockerc/core.py
@@ -26,6 +26,7 @@
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup import dialog
from ovirt_engine_setup.dockerc import constants as odockerccons
+from ovirt_engine_setup.engine_common import constants as oengcommcons
def _(m):
@@ -51,6 +52,10 @@
odockerccons.ConfigEnv.DOCKERC_DAEMON,
None
)
+ self.environment.setdefault(
+ oengcommcons.ConfigEnv.DOCKERC_NEEDED,
+ False
+ )
@plugin.event(
stage=plugin.Stages.STAGE_SETUP,
@@ -70,6 +75,9 @@
odockerccons.Stages.DOCKERC_CUSTOMIZE,
),
condition=lambda self: (
+ self.environment[
+ odockerccons.ConfigEnv.DOCKERC_NEEDED
+ ] and
(
self.environment[
odockerccons.ConfigEnv.DOCKERC_CINDER
diff --git a/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
b/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
index d51cd2e..fb92467 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
@@ -36,6 +36,10 @@
class Plugin(plugin.PluginBase):
"""Dockerc plugin."""
+ def __init__(self, context):
+ super(Plugin, self).__init__(context=context)
+ self._enabled = True
+
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
)
@@ -46,8 +50,21 @@
)
@plugin.event(
+ stage=plugin.Stages.STAGE_SETUP,
+ )
+ def _setup(self):
+ self._enabled = not self.environment[
+ osetupcons.CoreEnv.DEVELOPER_MODE
+ ]
+ if self._enabled:
+ self.environment[
+ odockerccons.ConfigEnv.DOCKERC_NEEDED
+ ] = True
+
+ @plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
name=odockerccons.Stages.REMOVE_CUSTOMIZATION_DOCKERC,
+ condition=lambda self: self._enabled,
)
def _customization(self):
if self.environment[
@@ -85,7 +102,7 @@
stage=plugin.Stages.STAGE_MISC,
condition=lambda self: (
self.environment[odockerccons.RemoveEnv.REMOVE_DOCKERC] and
- not self.environment[osetupcons.CoreEnv.DEVELOPER_MODE]
+ self._enabled
),
)
def _misc(self):
diff --git a/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
b/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
index e594336..59fa4dc 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
@@ -87,6 +87,10 @@
self._enabled = not self.environment[
osetupcons.CoreEnv.DEVELOPER_MODE
]
+ if self._enabled:
+ self.environment[
+ odockerccons.ConfigEnv.DOCKERC_NEEDED
+ ] = True
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
--
To view, visit https://gerrit.ovirt.org/42405
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I587c403072a4c2b690ed8fdadbfb386dbdde829f
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
