diff options
| author | Philippe Jandot <pjandot@kds.com> | 2015-09-16 16:49:09 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-11-06 10:43:28 -0800 |
| commit | c5ff5dff83f25790e7f9c3fa71406b78990be68d (patch) | |
| tree | 25e99c030cf6c1f2678832171cc2258bc446cce7 | |
| parent | 4b65a4a8b58bdeca8e15f4c9fa3c56edaaeb8f85 (diff) | |
| download | ansible-modules-core-cherrypick-docker-facts-fix.tar.gz | |
fix regression introduced by f38186ce8b49ea98e29241712da45917a3154e73, and propose a fix for docker factscherrypick-docker-facts-fix
| -rw-r--r-- | cloud/docker/docker.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index f299454f..d033eb50 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -1372,7 +1372,8 @@ def present(manager, containers, count, name): delta = count - len(containers.deployed) if delta > 0: - containers.notice_changed(manager.create_containers(delta)) + created = manager.create_containers(delta) + containers.notice_changed(manager.get_inspect_containers(created)) if delta < 0: # If both running and stopped containers exist, remove @@ -1387,8 +1388,8 @@ def present(manager, containers, count, name): to_remove.append(c) manager.stop_containers(to_stop) + containers.notice_changed(manager.get_inspect_containers(to_remove)) manager.remove_containers(to_remove) - containers.notice_changed(to_remove) def started(manager, containers, count, name): '''Ensure that exactly `count` matching containers exist and are running.''' @@ -1404,13 +1405,13 @@ def started(manager, containers, count, name): created = manager.create_containers(delta) manager.start_containers(created) - containers.notice_changed(created) + containers.notice_changed(manager.get_inspect_containers(created)) if delta < 0: excess = containers.running[0:-delta] + containers.notice_changed(manager.get_inspect_containers(excess)) manager.stop_containers(excess) manager.remove_containers(excess) - containers.notice_changed(excess) def reloaded(manager, containers, count, name): ''' @@ -1444,7 +1445,7 @@ def stopped(manager, containers, count, name): containers.refresh() manager.stop_containers(containers.running) - containers.notice_changed(containers.running) + containers.notice_changed(manager.get_inspect_containers(containers.running)) def killed(manager, containers, count, name): '''Kill any matching containers that are running.''' @@ -1452,7 +1453,7 @@ def killed(manager, containers, count, name): containers.refresh() manager.kill_containers(containers.running) - containers.notice_changed(containers.running) + containers.notice_changed(manager.get_inspect_containers(containers.running)) def absent(manager, containers, count, name): '''Stop and remove any matching containers.''' @@ -1460,8 +1461,8 @@ def absent(manager, containers, count, name): containers.refresh() manager.stop_containers(containers.running) + containers.notice_changed(manager.get_inspect_containers(containers.deployed)) manager.remove_containers(containers.deployed) - containers.notice_changed(containers.deployed) def main(): module = AnsibleModule( @@ -1561,7 +1562,6 @@ def main(): module.exit_json(changed=manager.has_changed(), msg=manager.get_summary_message(), summary=manager.counters, - containers=containers.changed, reload_reasons=manager.get_reload_reason_message(), ansible_facts=_ansible_facts(containers.changed)) |