image_uploader: conditionally import docker
Docker is deprecated in Stein cycle, so we need to pass if Docker isn't installed. Also removing the load of old module if new one failed, it' snot needed anymore. Change-Id: Ida068cbbd57b5be5fad91c33a0fa51e422034835
This commit is contained in:
parent
fe8dd5c907
commit
853b22d8de
|
@ -30,11 +30,13 @@ import tempfile
|
|||
import tenacity
|
||||
import yaml
|
||||
|
||||
import docker
|
||||
# Docker in TripleO is deprecated in Stein
|
||||
try:
|
||||
import docker
|
||||
from docker import APIClient as Client
|
||||
except ImportError:
|
||||
from docker import Client
|
||||
pass
|
||||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_log import log as logging
|
||||
from tripleo_common.actions import ansible
|
||||
|
|
Loading…
Reference in New Issue