ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 21:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

docker_* modules: improve diff (#48546)

Browse source 
* Add difference tracking tool

* Improve --diff mode for docker_container.

* Improve diffs of sets by ordering the sets.

* Rewrite imports, get rid of HAS_DOCKER_PY_x variables and use docker_version instead.

* Rename container -> active (more generic).

* Add --diff for docker_volume. Change old diff output.

* Add --diff for docker_network. Change old diff output.

* Add --diff for docker_swarm_service.

* Add changelog.

* Add entry for porting guide on docker_network and docker_volume.
This commit is contained in:
Felix Fontein 2018-11-19 10:59:54 +01:00 • committed by John R Barker
commit 891687284f
13 changed files with 356 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration/targets/docker_container/tasks/main.yml
View file

@ -22,6 +22,7 @@
state: absent
force_kill: yes
with_items: "{{ cnames }}"
diff: no
- name: "Make sure all networks are removed"
docker_network:
name: "{{ item }}"
@ -29,5 +30,6 @@
force: yes
with_items: "{{ dnetworks }}"
when: docker_py_version is version('1.10.0', '>=')
diff: no
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')

6
test/integration/targets/docker_container/tasks/tests/comparisons.yml
View file

@ -48,6 +48,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -101,6 +102,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -186,6 +188,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -273,6 +276,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -360,6 +364,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -448,6 +453,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:

1
test/integration/targets/docker_container/tasks/tests/image-ids.yml
View file

@ -66,6 +66,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:

70
test/integration/targets/docker_container/tasks/tests/options.yml
View file

@ -96,6 +96,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -160,6 +161,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -202,6 +204,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -246,6 +249,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -290,6 +294,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -334,6 +339,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -381,6 +387,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -428,6 +435,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -495,6 +503,7 @@
name: "{{ cname }}"
state: absent
register: detach_no_cleanup_cleanup
diff: no
- name: detach with cleanup
docker_container:
@ -509,6 +518,7 @@
name: "{{ cname }}"
state: absent
register: detach_cleanup_cleanup
diff: no
- name: detach with auto_remove and cleanup
docker_container:
@ -525,6 +535,7 @@
name: "{{ cname }}"
state: absent
register: detach_auto_remove_cleanup
diff: no
- assert:
that:
@ -597,6 +608,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -669,6 +681,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -747,6 +760,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -816,6 +830,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -886,6 +901,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -954,6 +970,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1016,6 +1033,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1061,6 +1079,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1137,6 +1156,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1199,6 +1219,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1234,6 +1255,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1293,6 +1315,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1354,6 +1377,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1421,6 +1445,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1552,6 +1577,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1607,6 +1633,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1654,6 +1681,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1704,6 +1732,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1758,6 +1787,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1821,6 +1851,7 @@
- "{{ cname_h1 }}"
loop_control:
loop_var: container_name
diff: no
- assert:
that:
@ -1865,6 +1896,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -1931,6 +1963,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2012,6 +2045,7 @@
- "{{ cname_h3 }}"
loop_control:
loop_var: container_name
diff: no
- assert:
that:
@ -2057,6 +2091,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2121,6 +2156,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2166,6 +2202,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2210,6 +2247,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2254,6 +2292,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2307,6 +2346,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2360,6 +2400,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2404,6 +2445,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2479,6 +2521,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2530,6 +2573,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2583,6 +2627,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2649,6 +2694,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2712,6 +2758,7 @@
- "{{ cname_h1 }}"
loop_control:
loop_var: container_name
diff: no
- assert:
that:
@ -2763,6 +2810,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2823,6 +2871,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2874,6 +2923,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -2928,6 +2978,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- debug: var=recreate_1
- debug: var=recreate_2
@ -2972,6 +3023,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- debug: var=restart_1
- debug: var=restart_2
@ -3019,6 +3071,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3066,6 +3119,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3102,6 +3156,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3183,6 +3238,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3228,6 +3284,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3272,6 +3329,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3316,6 +3374,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3390,6 +3449,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3457,6 +3517,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3508,6 +3569,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3568,6 +3630,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3613,6 +3676,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3660,6 +3724,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3713,6 +3778,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3769,6 +3835,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3841,6 +3908,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -3907,6 +3975,7 @@
- "{{ cname_h2 }}"
loop_control:
loop_var: container_name
diff: no
- assert:
that:
@ -3951,6 +4020,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:

3
test/integration/targets/docker_container/tasks/tests/ports.yml
View file

@ -84,6 +84,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -147,6 +148,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that:
@ -208,6 +210,7 @@
name: "{{ cname }}"
state: absent
force_kill: yes
diff: no
- assert:
that: