Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: fixing imports for dev-env environment
......................................................................
packaging: setup: fixing imports for dev-env environment
Avoid requiring docker as a generic import to avoid
breaking dev-env.
Change-Id: Ie04ac311b78abde8bceabcb89cbb4d30ec90a36d
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
M packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
2 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/40490/1
diff --git a/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
b/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
index 1b7238f..d51cd2e 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/dockerc/misc.py
@@ -19,7 +19,6 @@
"""Dockerc plugin."""
-import docker
import gettext
from otopi import plugin, util
@@ -45,7 +44,6 @@
odockerccons.RemoveEnv.REMOVE_DOCKERC,
None
)
- self._dcli = docker.Client(base_url='unix://var/run/docker.sock')
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
@@ -91,6 +89,9 @@
),
)
def _misc(self):
+ import docker
+ dcli = docker.Client(base_url='unix://var/run/docker.sock')
+
if self.environment[
odockerccons.RemoveEnv.REMOVE_DCLIST
]:
@@ -107,7 +108,7 @@
for cont in rlist:
self.logger.info(_('Stopping {cname}').format(cname=cont))
try:
- self._dcli.stop(
+ dcli.stop(
container=cont,
timeout=60,
)
@@ -124,7 +125,7 @@
raise ex
self.logger.info(_('Removing {cname}').format(cname=cont))
try:
- self._dcli.remove_container(
+ dcli.remove_container(
container=cont,
)
except docker.errors.APIError as ex:
@@ -141,7 +142,7 @@
still_deployed = [
str(name).lstrip('/')
- for d in self._dcli.containers(all=True)
+ for d in dcli.containers(all=True)
for name in d['Names']
]
diff --git a/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
b/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
index 1e9b7ab..e594336 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/dockerc/config.py
@@ -20,7 +20,6 @@
import base64
-import docker
import gettext
import json
import uuid
@@ -66,7 +65,7 @@
self._enabled = True
self._dimages = []
self._already_deployed_by_me = []
- self._dcli = docker.Client(base_url='unix://var/run/docker.sock')
+ self._dcli = None
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
@@ -229,6 +228,9 @@
condition=lambda self: self._enabled,
)
def _validation(self):
+ import docker
+ self._dcli = docker.Client(base_url='unix://var/run/docker.sock')
+
already_existing = set(
[
d['name']
@@ -285,6 +287,7 @@
condition=lambda self: self._enabled,
)
def _misc_deploy(self):
+ import docker
fqdn = self.environment[osetupcons.ConfigEnv.FQDN]
envdict = {
--
To view, visit https://gerrit.ovirt.org/40490
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04ac311b78abde8bceabcb89cbb4d30ec90a36d
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
