valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13728 from ticosax/remove-bbb-code

Browse Source 
Since we do not support older versions of docker-py than 0.3.2
This commit is contained in:
Thomas S Hatch 2014-06-25 14:58:49 -06:00
commit 2c7a8d265e
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
salt/modules/dockerio.py
View File

@ -903,32 +903,16 @@ def start(container,
'port_bindings must be formatted as a dictionary of '
'dictionaries'
)
try:
client.start(dcontainer,
binds=binds,
port_bindings=bindings,
lxc_conf=lxc_conf,
publish_all_ports=publish_all_ports,
links=links,
privileged=privileged,
dns=dns,
volumes_from=volumes_from,
network_mode=network_mode)
except TypeError:
# maybe older version of docker-py <= 0.3.1 dns and
# volumes_from are not accepted
# FIXME:
# Ideally we should write an explicit check based on
# version of docker-py package, but
# https://github.com/dotcloud/docker-py/issues/216
# prevents us to do it at the time I'm writing this.
client.start(dcontainer,
binds=binds,
port_bindings=bindings,
lxc_conf=lxc_conf,
publish_all_ports=publish_all_ports,
links=links,
privileged=privileged)
client.start(dcontainer,
binds=binds,
port_bindings=bindings,
lxc_conf=lxc_conf,
publish_all_ports=publish_all_ports,
links=links,
privileged=privileged,
dns=dns,
volumes_from=volumes_from,
network_mode=network_mode)
if is_running(dcontainer):
_valid(status,