openstack/kolla-ansible
Code Issues Proposed changes

Fix the kolla_toolbox module do not work on docker engine 1.10

Browse Source 
docker engine 1.10 and docker engine 1.12 have different response for
list containers. Use status=running filter instead. It is provided by
all docker version.

Closes-Bug: #1658015
Change-Id: I54df4b08f215322d97d604ebd84e04255a359ef6
This commit is contained in:
Jeffrey Zhang 2017-01-20 01:38:51 +08:00 committed by Jeffrey Zhang
parent 78b8f47bd5
commit 1aaca08b48
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/library/kolla_toolbox.py
View File

@ -87,14 +87,12 @@ def main():
module = AnsibleModule(argument_spec=specs, bypass_checks=True) module = AnsibleModule(argument_spec=specs, bypass_checks=True)
client = docker.Client() client = docker.Client()
command_line = gen_commandline(module.params) command_line = gen_commandline(module.params)
kolla_toolbox = client.containers(all=True, kolla_toolbox = client.containers(filters=dict(name='kolla_toolbox',
filters=dict(name='kolla_toolbox')) status='running'))
if not kolla_toolbox: if not kolla_toolbox:
module.fail_json(msg='Can not find kolla_toolbox container in target') module.fail_json(msg='kolla_toolbox container is not running.')
kolla_toolbox = kolla_toolbox[0]
if kolla_toolbox['State'] != 'running':
module.fail_json(msg='kolla_toolbox container is not running')
kolla_toolbox = kolla_toolbox[0]
job = client.exec_create(kolla_toolbox, command_line) job = client.exec_create(kolla_toolbox, command_line)
output = client.exec_start(job) output = client.exec_start(job)