openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix the kolla_toolbox module do not work on docker engine 1.10"

Browse Source
This commit is contained in:
Jenkins 2017-01-23 12:14:21 +00:00 committed by Gerrit Code Review
commit e7d59dbb03
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)