From dd19db8c8f41e070114b891fed63ca0cfae5b85c Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 15 Feb 2023 22:29:41 +0100 Subject: [PATCH] Normalize bools in tests. (#589) --- tests/ee/roles/docker_plain/tasks/main.yml | 2 +- .../targets/connection/test_connection.yml | 2 +- .../targets/docker_compose/tasks/main.yml | 8 +- .../docker_compose/tasks/tests/start-stop.yml | 20 +- .../tasks/test_docker_config.yml | 18 +- .../targets/docker_container/tasks/main.yml | 8 +- .../tasks/tests/comparisons.yml | 62 +- .../tasks/tests/compatibility.yml | 16 +- .../tasks/tests/image-ids.yml | 30 +- .../tasks/tests/mounts-volumes.yml | 68 +- .../docker_container/tasks/tests/network.yml | 116 ++-- .../docker_container/tasks/tests/options.yml | 624 +++++++++--------- .../docker_container/tasks/tests/ports.yml | 36 +- .../regression-45700-dont-parse-on-absent.yml | 2 +- .../tasks/tests/start-stop.yml | 78 +-- .../docker_container/tasks/tests/update.yml | 12 +- .../tasks/tests/content.yml | 2 +- .../tasks/tests/file.yml | 2 +- .../docker_container_exec/tasks/main.yml | 6 +- .../docker_container_info/tasks/main.yml | 8 +- .../docker_host_info/tasks/test_host_info.yml | 60 +- .../targets/docker_image/tasks/test.yml | 2 +- .../docker_image/tasks/tests/basic.yml | 6 +- .../docker_image/tasks/tests/docker_image.yml | 30 +- .../docker_image/tasks/tests/options.yml | 64 +- .../targets/docker_image_load/tasks/test.yml | 2 +- .../docker_login/tasks/tests/docker_login.yml | 20 +- .../targets/docker_network/tasks/main.yml | 4 +- .../docker_network/tasks/tests/basic.yml | 6 +- .../docker_network/tasks/tests/ipam.yml | 34 +- .../docker_network/tasks/tests/options.yml | 24 +- .../docker_network/tasks/tests/overlay.yml | 4 +- .../docker_network_info/tasks/main.yml | 6 +- .../targets/docker_node/tasks/main.yml | 10 +- .../targets/docker_node/tasks/test_node.yml | 70 +- .../docker_node_info/tasks/test_node_info.yml | 4 +- .../targets/docker_prune/tasks/main.yml | 14 +- .../docker_secret/tasks/test_secrets.yml | 14 +- .../targets/docker_stack/tasks/test_stack.yml | 4 +- .../targets/docker_swarm/tasks/cleanup.yml | 6 +- .../docker_swarm/tasks/tests/basic.yml | 38 +- .../docker_swarm/tasks/tests/options.yml | 340 +++++----- .../tasks/tests/remote-addr-pool.yml | 22 +- .../tasks/test_swarm_info.yml | 22 +- .../docker_swarm_service/tasks/main.yml | 20 +- .../tasks/tests/configs.yml | 106 +-- .../tasks/tests/logging.yml | 20 +- .../docker_swarm_service/tasks/tests/misc.yml | 10 +- .../tasks/tests/mounts.yml | 98 +-- .../tasks/tests/networks.yml | 78 +-- .../tasks/tests/options.yml | 462 ++++++------- .../tasks/tests/placement.yml | 66 +- .../tasks/tests/resources.yml | 32 +- .../tasks/tests/restart_config.yml | 32 +- .../tasks/tests/rollback_config.yml | 84 +-- .../tasks/tests/secrets.yml | 106 +-- .../tasks/tests/update_config.yml | 74 +-- .../tasks/test_docker_swarm_service_info.yml | 4 +- .../targets/docker_volume_info/tasks/main.yml | 2 +- .../generic_connection_tests/tasks/main.yml | 6 +- .../playbooks/docker_cleanup.yml | 4 +- .../playbooks/docker_setup.yml | 2 +- .../playbooks/test_inventory_1.yml | 2 +- .../playbooks/test_inventory_2.yml | 4 +- .../playbooks/pre-setup.yml | 2 +- .../playbooks/test_inventory_1.yml | 6 +- .../playbooks/swarm_cleanup.yml | 4 +- .../playbooks/swarm_setup.yml | 2 +- .../playbooks/test_inventory_1.yml | 10 +- .../playbooks/test_inventory_2.yml | 2 +- .../targets/setup_docker/defaults/main.yml | 2 +- .../targets/setup_docker/tasks/Alpine.yml | 2 +- .../targets/setup_docker/tasks/Archlinux.yml | 2 +- .../targets/setup_docker/tasks/Fedora.yml | 4 +- .../targets/setup_docker/tasks/Suse.yml | 6 +- .../targets/setup_docker/tasks/main.yml | 22 +- .../setup_docker_compose/tasks/Suse.yml | 6 +- .../setup_docker_compose_v2/tasks/Suse.yml | 6 +- .../handlers/cleanup.yml | 16 +- .../tasks/setup-frontend.yml | 4 +- .../targets/setup_pkg_mgr/tasks/main.yml | 4 +- .../tasks/default-cleanup.yml | 2 +- 82 files changed, 1620 insertions(+), 1620 deletions(-) diff --git a/tests/ee/roles/docker_plain/tasks/main.yml b/tests/ee/roles/docker_plain/tasks/main.yml index a8669435..9c2be8a0 100644 --- a/tests/ee/roles/docker_plain/tasks/main.yml +++ b/tests/ee/roles/docker_plain/tasks/main.yml @@ -29,4 +29,4 @@ name: "{{ cname_prefix }}-1" state: absent stop_timeout: 1 - force_kill: yes + force_kill: true diff --git a/tests/integration/targets/connection/test_connection.yml b/tests/integration/targets/connection/test_connection.yml index 157a7821..bb0a9939 100644 --- a/tests/integration/targets/connection/test_connection.yml +++ b/tests/integration/targets/connection/test_connection.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - hosts: "{{ target_hosts }}" - gather_facts: no + gather_facts: false serial: 1 tasks: diff --git a/tests/integration/targets/docker_compose/tasks/main.yml b/tests/integration/targets/docker_compose/tasks/main.yml index 41edc1e9..d3c7eae5 100644 --- a/tests/integration/targets/docker_compose/tasks/main.yml +++ b/tests/integration/targets/docker_compose/tasks/main.yml @@ -29,17 +29,17 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true with_items: "{{ cnames }}" - diff: no + diff: false - name: "Make sure all networks are removed" docker_network: name: "{{ item }}" state: absent - force: yes + force: true with_items: "{{ dnetworks }}" when: docker_py_version is version('1.10.0', '>=') - diff: no + diff: false when: has_docker_compose and docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_compose/tasks/tests/start-stop.yml b/tests/integration/targets/docker_compose/tasks/tests/start-stop.yml index 93aff8b0..89945071 100644 --- a/tests/integration/targets/docker_compose/tasks/tests/start-stop.yml +++ b/tests/integration/targets/docker_compose/tasks/tests/start-stop.yml @@ -38,7 +38,7 @@ project_name: "{{ pname }}" state: present definition: "{{ test_service | from_yaml }}" - check_mode: yes + check_mode: true register: present_1 - name: Present @@ -60,7 +60,7 @@ project_name: "{{ pname }}" state: present definition: "{{ test_service | from_yaml }}" - check_mode: yes + check_mode: true register: present_4 - name: Present (changed check) @@ -68,7 +68,7 @@ project_name: "{{ pname }}" state: present definition: "{{ test_service_mod | from_yaml }}" - check_mode: yes + check_mode: true register: present_5 - name: Present (changed) @@ -96,7 +96,7 @@ project_name: "{{ pname }}" state: absent definition: "{{ test_service_mod | from_yaml }}" - check_mode: yes + check_mode: true register: absent_1 - name: Absent @@ -118,7 +118,7 @@ project_name: "{{ pname }}" state: absent definition: "{{ test_service_mod | from_yaml }}" - check_mode: yes + check_mode: true register: absent_4 - assert: @@ -138,7 +138,7 @@ state: present definition: "{{ test_service | from_yaml }}" stopped: true - check_mode: yes + check_mode: true register: present_1 - name: Present stopped @@ -163,7 +163,7 @@ state: present definition: "{{ test_service | from_yaml }}" stopped: true - check_mode: yes + check_mode: true register: present_4 - name: Started (check) @@ -171,7 +171,7 @@ project_name: "{{ pname }}" state: present definition: "{{ test_service | from_yaml }}" - check_mode: yes + check_mode: true register: started_1 - name: Started @@ -193,7 +193,7 @@ project_name: "{{ pname }}" state: present definition: "{{ test_service | from_yaml }}" - check_mode: yes + check_mode: true register: started_4 - name: Stopped (check) @@ -202,7 +202,7 @@ state: present definition: "{{ test_service | from_yaml }}" stopped: true - check_mode: yes + check_mode: true register: stopped_1 - name: Stopped diff --git a/tests/integration/targets/docker_config/tasks/test_docker_config.yml b/tests/integration/targets/docker_config/tasks/test_docker_config.yml index fae10579..015e8003 100644 --- a/tests/integration/targets/docker_config/tasks/test_docker_config.yml +++ b/tests/integration/targets/docker_config/tasks/test_docker_config.yml @@ -22,7 +22,7 @@ - name: Parameter name should be required docker_config: state: present - ignore_errors: yes + ignore_errors: true register: output - name: Assert failure when called with no name @@ -35,7 +35,7 @@ docker_config: name: foo state: present - ignore_errors: yes + ignore_errors: true register: output - name: Assert failure when called with no data @@ -58,7 +58,7 @@ - name: Inspect config command: "docker config inspect {{ config_id }}" register: inspect - ignore_errors: yes + ignore_errors: true - debug: var: inspect @@ -138,7 +138,7 @@ - name: Check that config is removed command: "docker config inspect {{ config_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: Assert config was removed assert: @@ -173,7 +173,7 @@ - name: Inspect config command: "docker config inspect {{ config_id }}" register: inspect - ignore_errors: yes + ignore_errors: true - debug: var: inspect @@ -216,7 +216,7 @@ - name: Check that config is removed command: "docker config inspect {{ original_output.config_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: Assert config was removed assert: @@ -226,7 +226,7 @@ - name: Check that config is removed command: "docker config inspect {{ new_output.config_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: Assert config was removed assert: @@ -263,7 +263,7 @@ data: opensesame! template_driver: "not a template driver" state: present - ignore_errors: yes + ignore_errors: true register: output - name: Assert failure when called with invalid template_driver @@ -320,7 +320,7 @@ - name: Check that config is removed command: "docker config inspect {{ output.config_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: Assert config was removed assert: diff --git a/tests/integration/targets/docker_container/tasks/main.yml b/tests/integration/targets/docker_container/tasks/main.yml index f9c1f663..9911452f 100644 --- a/tests/integration/targets/docker_container/tasks/main.yml +++ b/tests/integration/targets/docker_container/tasks/main.yml @@ -43,9 +43,9 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true with_items: "{{ cnames }}" - diff: no + diff: false - name: "Make sure all images are removed" docker_image: name: "{{ item }}" @@ -55,9 +55,9 @@ docker_network: name: "{{ item }}" state: absent - force: yes + force: true with_items: "{{ dnetworks }}" - diff: no + diff: false when: docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_container/tasks/tests/comparisons.yml b/tests/integration/targets/docker_container/tasks/tests/comparisons.yml index 65c25c38..54f0d4a6 100644 --- a/tests/integration/targets/docker_container/tasks/tests/comparisons.yml +++ b/tests/integration/targets/docker_container/tasks/tests/comparisons.yml @@ -30,7 +30,7 @@ name: "{{ cname }}" state: started hostname: example.org - force_kill: yes + force_kill: true comparisons: hostname: ignore register: value_2 @@ -42,7 +42,7 @@ name: "{{ cname }}" state: started hostname: example.org - force_kill: yes + force_kill: true comparisons: hostname: strict register: value_3 @@ -51,8 +51,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -83,7 +83,7 @@ state: started dns_servers: - 9.9.9.9 - force_kill: yes + force_kill: true comparisons: dns_servers: ignore register: list_2 @@ -96,7 +96,7 @@ state: started dns_servers: - 9.9.9.9 - force_kill: yes + force_kill: true comparisons: dns_servers: strict register: list_3 @@ -105,8 +105,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -139,7 +139,7 @@ - "1010" - "1011" - "1012" - force_kill: yes + force_kill: true comparisons: groups: ignore register: set_2 @@ -154,7 +154,7 @@ - "1010" - "1011" - "1012" - force_kill: yes + force_kill: true comparisons: groups: allow_more_present register: set_3 @@ -168,7 +168,7 @@ groups: - "1010" - "1012" - force_kill: yes + force_kill: true comparisons: groups: allow_more_present register: set_4 @@ -182,7 +182,7 @@ groups: - "1010" - "1012" - force_kill: yes + force_kill: true comparisons: groups: strict register: set_5 @@ -191,8 +191,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -227,7 +227,7 @@ - "/dev/random:/dev/virt-random:rwm" - "/dev/urandom:/dev/virt-urandom:rwm" - "/dev/null:/dev/virt-null:rwm" - force_kill: yes + force_kill: true comparisons: devices: ignore register: set_dict_2 @@ -242,7 +242,7 @@ - "/dev/random:/dev/virt-random:rwm" - "/dev/urandom:/dev/virt-urandom:rwm" - "/dev/null:/dev/virt-null:rwm" - force_kill: yes + force_kill: true comparisons: devices: allow_more_present register: set_dict_3 @@ -256,7 +256,7 @@ devices: - "/dev/random:/dev/virt-random:rwm" - "/dev/null:/dev/virt-null:rwm" - force_kill: yes + force_kill: true comparisons: devices: allow_more_present register: set_dict_4 @@ -270,7 +270,7 @@ devices: - "/dev/random:/dev/virt-random:rwm" - "/dev/null:/dev/virt-null:rwm" - force_kill: yes + force_kill: true comparisons: devices: strict register: set_dict_5 @@ -279,8 +279,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -315,7 +315,7 @@ ansible.test.1: hello ansible.test.2: world ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: labels: ignore register: dict_2 @@ -330,7 +330,7 @@ ansible.test.1: hello ansible.test.2: world ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: labels: allow_more_present register: dict_3 @@ -344,7 +344,7 @@ labels: ansible.test.1: hello ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: labels: allow_more_present register: dict_4 @@ -358,7 +358,7 @@ labels: ansible.test.1: hello ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: labels: strict register: dict_5 @@ -367,8 +367,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -413,7 +413,7 @@ labels: ansible.test.1: hello ansible.test.4: ignore - force_kill: yes + force_kill: true comparisons: '*': ignore register: wildcard_2 @@ -430,7 +430,7 @@ ansible.test.1: hello ansible.test.2: world ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: '*': strict register: wildcard_3 @@ -447,7 +447,7 @@ ansible.test.1: hello ansible.test.2: world ansible.test.3: ansible - force_kill: yes + force_kill: true comparisons: '*': strict register: wildcard_4 @@ -456,8 +456,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: diff --git a/tests/integration/targets/docker_container/tasks/tests/compatibility.yml b/tests/integration/targets/docker_container/tasks/tests/compatibility.yml index 2ec90965..265aacac 100644 --- a/tests/integration/targets/docker_container/tasks/tests/compatibility.yml +++ b/tests/integration/targets/docker_container/tasks/tests/compatibility.yml @@ -21,7 +21,7 @@ command: '/bin/sh -c "sleep 10m"' state: started container_default_behavior: compatibility - check_mode: yes + check_mode: true register: start_1 - name: Start container @@ -48,15 +48,15 @@ image: "{{ docker_test_image_alpine }}" state: started container_default_behavior: compatibility - check_mode: yes + check_mode: true register: start_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -76,7 +76,7 @@ command: '/bin/sh -c "sleep 10m"' state: started container_default_behavior: no_defaults - check_mode: yes + check_mode: true register: start_1 - name: Start container @@ -104,15 +104,15 @@ command: '/bin/sh -c "sleep 10m"' state: started container_default_behavior: no_defaults - check_mode: yes + check_mode: true register: start_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: diff --git a/tests/integration/targets/docker_container/tasks/tests/image-ids.yml b/tests/integration/targets/docker_container/tasks/tests/image-ids.yml index d355c6a5..76270c68 100644 --- a/tests/integration/targets/docker_container/tasks/tests/image-ids.yml +++ b/tests/integration/targets/docker_container/tasks/tests/image-ids.yml @@ -40,7 +40,7 @@ image: "{{ image_info.images[0].Id }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: create_1 - name: Create container with {{ docker_test_image_hello_world }} image via ID (idempotent) @@ -48,7 +48,7 @@ image: "{{ image_info.images[0].Id }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: create_2 - name: Create container with {{ docker_test_image_alpine }} image via ID @@ -56,7 +56,7 @@ image: "{{ image_info.images[1].Id }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: create_3 - name: Create container with {{ docker_test_image_alpine }} image via ID (idempotent) @@ -64,14 +64,14 @@ image: "{{ image_info.images[1].Id }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: create_4 - name: Untag image # Image will not be deleted since the container still uses it docker_image: name: "{{ docker_test_image_alpine }}" - force_absent: yes + force_absent: true state: absent - name: Create container with {{ docker_test_image_alpine }} image via name (check mode, will pull, same image) @@ -80,7 +80,7 @@ name: "{{ cname }}" state: present register: create_5 - check_mode: yes + check_mode: true - name: Create container with {{ docker_test_image_alpine }} image via name (will pull, same image) docker_container: @@ -93,8 +93,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -112,7 +112,7 @@ image: "{{ docker_test_image_digest_base }}@sha256:{{ docker_test_image_digest_v1 }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: digest_1 - name: Create container with {{ docker_test_image_digest_base }} image via old digest (idempotent) @@ -120,16 +120,16 @@ image: "{{ docker_test_image_digest_base }}@sha256:{{ docker_test_image_digest_v1 }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: digest_2 - name: Create container with {{ docker_test_image_digest_base }} image via old digest (idempotent, pull) docker_container: image: "{{ docker_test_image_digest_base }}@sha256:{{ docker_test_image_digest_v1 }}" name: "{{ cname }}" - pull: yes + pull: true state: present - force_kill: yes + force_kill: true register: digest_3 - name: Update container with {{ docker_test_image_digest_base }} image via new digest @@ -137,15 +137,15 @@ image: "{{ docker_test_image_digest_base }}@sha256:{{ docker_test_image_digest_v2 }}" name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: digest_4 - name: Cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: diff --git a/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml b/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml index 646f6b6e..3ce6691a 100644 --- a/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml +++ b/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml @@ -35,7 +35,7 @@ - source: / target: /whatever type: bind - read_only: no + read_only: false register: mounts_1 - name: mounts (idempotency) @@ -48,7 +48,7 @@ - source: / target: /whatever type: bind - read_only: no + read_only: false - source: /tmp target: /tmp type: bind @@ -79,8 +79,8 @@ - source: /tmp target: /somewhereelse type: bind - read_only: yes - force_kill: yes + read_only: true + force_kill: true register: mounts_4 - name: mounts (different modes) @@ -96,8 +96,8 @@ - source: /tmp target: /somewhereelse type: bind - read_only: no - force_kill: yes + read_only: false + force_kill: true register: mounts_5 - name: mounts (endpoint collision) @@ -113,10 +113,10 @@ - source: /etc target: /x type: bind - read_only: no - force_kill: yes + read_only: false + force_kill: true register: mounts_6 - ignore_errors: yes + ignore_errors: true - name: mounts (anonymous volume) docker_container: @@ -146,8 +146,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -255,8 +255,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -280,7 +280,7 @@ - source: / target: /whatever type: bind - read_only: yes + read_only: true volumes: - /tmp:/tmp register: mounts_volumes_1 @@ -295,7 +295,7 @@ - source: / target: /whatever type: bind - read_only: yes + read_only: true volumes: - /tmp:/tmp register: mounts_volumes_2 @@ -310,10 +310,10 @@ - source: /tmp target: /tmp type: bind - read_only: no + read_only: false volumes: - /:/whatever:ro - force_kill: yes + force_kill: true register: mounts_volumes_3 - name: mounts + volumes (collision, should fail) @@ -326,19 +326,19 @@ - source: /tmp target: /tmp type: bind - read_only: no + read_only: false volumes: - /tmp:/tmp - force_kill: yes + force_kill: true register: mounts_volumes_4 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -377,15 +377,15 @@ name: "{{ cname }}" volume_driver: / state: started - force_kill: yes + force_kill: true register: volume_driver_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -440,7 +440,7 @@ volumes: - "/tmp:/tmp" - "/tmp:/somewhereelse:ro,Z" - force_kill: yes + force_kill: true register: volumes_4 - name: volumes (different modes) @@ -452,7 +452,7 @@ volumes: - "/tmp:/tmp" - "/tmp:/somewhereelse:ro" - force_kill: yes + force_kill: true register: volumes_5 - name: volumes (collision) @@ -464,16 +464,16 @@ volumes: - "/etc:/tmp" - "/home:/tmp:ro" - force_kill: yes + force_kill: true register: volumes_6 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -531,21 +531,21 @@ name: "{{ cname }}" state: started volumes_from: "{{ cname_h2 }}" - force_kill: yes + force_kill: true register: volumes_from_3 - name: cleanup docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname_h1 }}" - "{{ cname_h2 }}" loop_control: loop_var: container_name - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_container/tasks/tests/network.yml b/tests/integration/targets/docker_container/tasks/tests/network.yml index adab728f..d6a6f0bc 100644 --- a/tests/integration/targets/docker_container/tasks/tests/network.yml +++ b/tests/integration/targets/docker_container/tasks/tests/network.yml @@ -55,7 +55,7 @@ - name: Create network with fixed IPv4 and IPv6 subnets docker_network: name: "{{ nname_3 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: "{{ subnet_ipv4 }}" - subnet: "{{ subnet_ipv6 }}" @@ -90,7 +90,7 @@ name: "{{ cname }}" state: started network_mode: none - force_kill: yes + force_kill: true register: network_mode_3 - name: network_mode (container mode setup) @@ -108,7 +108,7 @@ name: "{{ cname }}" state: started network_mode: "container:{{ cname_h1_id.container.Id }}" - force_kill: yes + force_kill: true register: network_mode_4 - name: network_mode (container mode idempotency) @@ -124,13 +124,13 @@ docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname_h1 }}" loop_control: loop_var: container_name - diff: no + diff: false - assert: that: @@ -158,7 +158,7 @@ networks: - name: "{{ nname_1 }}" - name: "{{ nname_2 }}" - networks_cli_compatible: no + networks_cli_compatible: false register: networks_1 - name: networks_cli_compatible=no, networks w/o purge_networks @@ -170,7 +170,7 @@ networks: - name: "{{ nname_1 }}" - name: "{{ nname_2 }}" - networks_cli_compatible: no + networks_cli_compatible: false register: networks_2 - name: networks_cli_compatible=no, networks, purge_networks @@ -184,8 +184,8 @@ networks: - name: bridge - name: "{{ nname_1 }}" - networks_cli_compatible: no - force_kill: yes + networks_cli_compatible: false + force_kill: true register: networks_3 - name: networks_cli_compatible=no, networks, purge_networks (idempotency) @@ -199,7 +199,7 @@ networks: - name: "{{ nname_1 }}" - name: bridge - networks_cli_compatible: no + networks_cli_compatible: false register: networks_4 - name: networks_cli_compatible=no, networks (less networks) @@ -210,7 +210,7 @@ state: started networks: - name: bridge - networks_cli_compatible: no + networks_cli_compatible: false register: networks_5 - name: networks_cli_compatible=no, networks, purge_networks (less networks) @@ -223,8 +223,8 @@ networks: strict networks: - name: bridge - networks_cli_compatible: no - force_kill: yes + networks_cli_compatible: false + force_kill: true register: networks_6 - name: networks_cli_compatible=no, networks, purge_networks (more networks) @@ -238,16 +238,16 @@ networks: - name: bridge - name: "{{ nname_2 }}" - networks_cli_compatible: no - force_kill: yes + networks_cli_compatible: false + force_kill: true register: networks_7 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -304,7 +304,7 @@ - alias1 - alias2 - name: "{{ nname_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_1 - name: networks_cli_compatible=yes, networks specified @@ -316,15 +316,15 @@ networks: - name: "{{ nname_1 }}" - name: "{{ nname_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_2 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - name: networks_cli_compatible=yes, empty networks list specified docker_container: @@ -333,7 +333,7 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_3 - name: networks_cli_compatible=yes, empty networks list specified @@ -343,7 +343,7 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_4 - name: networks_cli_compatible=yes, empty networks list specified, purge_networks @@ -353,18 +353,18 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: networks: strict - force_kill: yes + force_kill: true register: networks_5 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - name: networks_cli_compatible=yes, networks not specified docker_container: @@ -372,8 +372,8 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - networks_cli_compatible: yes - force_kill: yes + networks_cli_compatible: true + force_kill: true register: networks_6 - name: networks_cli_compatible=yes, networks not specified @@ -382,7 +382,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_7 - name: networks_cli_compatible=yes, networks not specified, purge_networks @@ -391,21 +391,21 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - networks_cli_compatible: yes + networks_cli_compatible: true purge_networks: true # To replace `purge_networks=true`, we have to specify `networks: []`: # comparisons: # networks: strict # networks: [] - force_kill: yes + force_kill: true register: networks_8 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - debug: var=networks_3 @@ -456,7 +456,7 @@ state: started networks: - name: "{{ nname_1 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_1 - name: different networks, comparisons=ignore @@ -467,7 +467,7 @@ state: started networks: - name: "{{ nname_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: network_mode: ignore # otherwise we'd have to set network_mode to nname_1 networks: ignore @@ -480,7 +480,7 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: networks: ignore register: networks_3 @@ -492,7 +492,7 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: networks: allow_more_present register: networks_4 @@ -505,11 +505,11 @@ state: started networks: - name: "{{ nname_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: network_mode: ignore # otherwise we'd have to set network_mode to nname_1 networks: allow_more_present - force_kill: yes + force_kill: true register: networks_5 - name: different networks, comparisons=strict @@ -520,10 +520,10 @@ state: started networks: - name: "{{ nname_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: networks: strict - force_kill: yes + force_kill: true register: networks_6 - name: less networks, comparisons=strict @@ -533,18 +533,18 @@ name: "{{ cname }}" state: started networks: [] - networks_cli_compatible: yes + networks_cli_compatible: true comparisons: networks: strict - force_kill: yes + force_kill: true register: networks_7 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -591,7 +591,7 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_2 }}" ipv6_address: "{{ nname_3_ipv6_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_1 - name: create container (stopped) with one network and fixed IP (idempotent) @@ -604,7 +604,7 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_2 }}" ipv6_address: "{{ nname_3_ipv6_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_2 - name: create container (stopped) with one network and fixed IP (different IPv4) @@ -617,7 +617,7 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_3 }}" ipv6_address: "{{ nname_3_ipv6_2 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_3 - name: create container (stopped) with one network and fixed IP (different IPv6) @@ -630,7 +630,7 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_3 }}" ipv6_address: "{{ nname_3_ipv6_3 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_4 - name: create container (started) with one network and fixed IP @@ -649,8 +649,8 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_4 }}" ipv6_address: "{{ nname_3_ipv6_3 }}" - networks_cli_compatible: yes - force_kill: yes + networks_cli_compatible: true + force_kill: true register: networks_6 - name: create container (started) with one network and fixed IP (different IPv6) @@ -663,8 +663,8 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_4 }}" ipv6_address: "{{ nname_3_ipv6_4 }}" - networks_cli_compatible: yes - force_kill: yes + networks_cli_compatible: true + force_kill: true register: networks_7 - name: create container (started) with one network and fixed IP (idempotent) @@ -677,15 +677,15 @@ - name: "{{ nname_3 }}" ipv4_address: "{{ nname_3_ipv4_4 }}" ipv6_address: "{{ nname_3_ipv6_4 }}" - networks_cli_compatible: yes + networks_cli_compatible: true register: networks_8 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -738,7 +738,7 @@ docker_network: name: "{{ network_name }}" state: absent - force: yes + force: true loop: - "{{ nname_1 }}" - "{{ nname_2 }}" diff --git a/tests/integration/targets/docker_container/tasks/tests/options.yml b/tests/integration/targets/docker_container/tasks/tests/options.yml index 979b02f3..1254fb52 100644 --- a/tests/integration/targets/docker_container/tasks/tests/options.yml +++ b/tests/integration/targets/docker_container/tasks/tests/options.yml @@ -23,7 +23,7 @@ command: '/bin/sh -c "echo"' name: "{{ cname }}" state: started - auto_remove: yes + auto_remove: true register: auto_remove_1 - name: Give container 1 second to be sure it terminated @@ -72,7 +72,7 @@ name: "{{ cname }}" state: started blkio_weight: 234 - force_kill: yes + force_kill: true register: blkio_weight_3 ignore_errors: true @@ -80,8 +80,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - when: blkio_weight_1 is failed assert: @@ -146,15 +146,15 @@ - setgid cap_drop: - all - force_kill: yes + force_kill: true register: capabilities_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -175,7 +175,7 @@ state: started cgroupns_mode: host register: cgroupns_mode_1 - ignore_errors: yes + ignore_errors: true - name: cgroupns_mode (idempotency) docker_container: @@ -185,7 +185,7 @@ state: started cgroupns_mode: host register: cgroupns_mode_2 - ignore_errors: yes + ignore_errors: true - name: cgroupns_mode (changed) docker_container: @@ -195,14 +195,14 @@ state: started cgroupns_mode: private register: cgroupns_mode_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -251,8 +251,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -303,7 +303,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: command_4 - name: command (compatibility, empty list) @@ -313,15 +313,15 @@ command: [] name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: command_5 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -371,7 +371,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: command_4 - name: command (correct, empty list) @@ -381,15 +381,15 @@ command: [] name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: command_5 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -428,15 +428,15 @@ name: "{{ cname }}" cpu_period: 50000 state: started - force_kill: yes + force_kill: true register: cpu_period_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -473,15 +473,15 @@ name: "{{ cname }}" cpu_quota: 50000 state: started - force_kill: yes + force_kill: true register: cpu_quota_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -518,15 +518,15 @@ name: "{{ cname }}" cpu_shares: 1100 state: started - force_kill: yes + force_kill: true register: cpu_shares_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -563,18 +563,18 @@ name: "{{ cname }}" cpuset_cpus: "1" state: started - force_kill: yes + force_kill: true # This will fail if the system the test is run on doesn't have # multiple CPUs/cores available. - ignore_errors: yes + ignore_errors: true register: cpuset_cpus_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -611,18 +611,18 @@ name: "{{ cname }}" cpuset_mems: "1" state: started - force_kill: yes + force_kill: true # This will fail if the system the test is run on doesn't have # multiple MEMs available. - ignore_errors: yes + ignore_errors: true register: cpuset_mems_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -659,7 +659,7 @@ name: "{{ cname }}" cpus: 1.5 state: started - force_kill: yes + force_kill: true # This will fail if the system the test is run on doesn't have # multiple MEMs available. register: cpus_3 @@ -668,8 +668,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -687,14 +687,14 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: present - debug: yes + debug: true register: debug_1 - name: debug (start) docker_container: name: "{{ cname }}" state: started - debug: yes + debug: true register: debug_2 - name: debug (stop) @@ -702,16 +702,16 @@ image: "{{ docker_test_image_alpine }}" name: "{{ cname }}" state: stopped - force_kill: yes - debug: yes + force_kill: true + debug: true register: debug_3 - name: debug (absent) docker_container: name: "{{ cname }}" state: absent - debug: yes - force_kill: yes + debug: true + force_kill: true register: debug_4 - assert: @@ -729,7 +729,7 @@ docker_container: name: "{{ cname }}" image: "{{ docker_test_image_hello_world }}" - detach: no + detach: false register: detach_no_cleanup - name: cleanup @@ -737,14 +737,14 @@ name: "{{ cname }}" state: absent register: detach_no_cleanup_cleanup - diff: no + diff: false - name: detach with cleanup docker_container: name: "{{ cname }}" image: "{{ docker_test_image_hello_world }}" - detach: no - cleanup: yes + detach: false + cleanup: true register: detach_cleanup - name: cleanup (unnecessary) @@ -752,32 +752,32 @@ name: "{{ cname }}" state: absent register: detach_cleanup_cleanup - diff: no + diff: false - name: detach with auto_remove and cleanup docker_container: name: "{{ cname }}" image: "{{ docker_test_image_hello_world }}" - detach: no - auto_remove: yes - cleanup: yes + detach: false + auto_remove: true + cleanup: true register: detach_auto_remove - ignore_errors: yes + ignore_errors: true - name: cleanup (unnecessary) docker_container: name: "{{ cname }}" state: absent register: detach_auto_remove_cleanup - diff: no + diff: false - name: detach with cleanup and non-zero status docker_container: name: "{{ cname }}" image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "exit 42"' - detach: no - cleanup: yes + detach: false + cleanup: true register: detach_cleanup_nonzero ignore_errors: true @@ -847,15 +847,15 @@ devices: - "/dev/random:/dev/virt-random:rwm" - "/dev/null:/dev/virt-null:rwm" - force_kill: yes + force_kill: true register: devices_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -919,7 +919,7 @@ rate: 10M - path: /dev/urandom rate: 5K - force_kill: yes + force_kill: true register: device_read_bps_4 ignore_errors: true @@ -927,8 +927,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - when: device_read_bps_1 is not failed assert: @@ -1002,7 +1002,7 @@ rate: 30 - path: /dev/urandom rate: 50 - force_kill: yes + force_kill: true register: device_read_iops_4 ignore_errors: true @@ -1010,8 +1010,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - when: device_read_iops_1 is not failed assert: @@ -1076,7 +1076,7 @@ device_write_iops: - path: /dev/urandom rate: 100 - force_kill: yes + force_kill: true register: device_write_limit_3 ignore_errors: true @@ -1084,8 +1084,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - when: device_write_limit_1 is not failed assert: @@ -1112,7 +1112,7 @@ state: started device_requests: [] register: device_requests_1 - ignore_errors: yes + ignore_errors: true - name: device_requests (idempotency) docker_container: @@ -1122,14 +1122,14 @@ state: started device_requests: [] register: device_requests_2 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1188,15 +1188,15 @@ dns_opts: - "timeout:10" - no-check-names - force_kill: yes + force_kill: true register: dns_opts_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1240,7 +1240,7 @@ dns_search_domains: - example.org - example.com - force_kill: yes + force_kill: true register: dns_search_domains_3 - name: dns_search_domains (changed elements) @@ -1252,15 +1252,15 @@ dns_search_domains: - ansible.com - example.com - force_kill: yes + force_kill: true register: dns_search_domains_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1304,7 +1304,7 @@ dns_servers: - 8.8.8.8 - 1.1.1.1 - force_kill: yes + force_kill: true register: dns_servers_3 - name: dns_servers (changed elements) @@ -1316,15 +1316,15 @@ dns_servers: - 8.8.8.8 - 9.9.9.9 - force_kill: yes + force_kill: true register: dns_servers_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1362,15 +1362,15 @@ name: "{{ cname }}" domainname: example.org state: started - force_kill: yes + force_kill: true register: domainname_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1421,7 +1421,7 @@ - "-v" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_3 - name: entrypoint (compatibility, fewer parameters) @@ -1434,7 +1434,7 @@ - "'sleep 10m'" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_4 - name: entrypoint (compatibility, other parameters) @@ -1447,7 +1447,7 @@ - "'sleep 5m'" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_5 - name: entrypoint (compatibility, force empty) @@ -1457,15 +1457,15 @@ entrypoint: [] name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_6 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1515,7 +1515,7 @@ - "-v" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_3 - name: entrypoint (correct, fewer parameters) @@ -1528,7 +1528,7 @@ - "sleep 10m" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_4 - name: entrypoint (correct, other parameters) @@ -1541,7 +1541,7 @@ - "sleep 5m" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_5 - name: entrypoint (correct, force empty) @@ -1551,15 +1551,15 @@ entrypoint: [] name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: entrypoint_6 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1621,7 +1621,7 @@ env: TEST1: val1 TEST3: val3 - force_kill: yes + force_kill: true register: env_4 - name: env (fail unwrapped values) @@ -1632,16 +1632,16 @@ state: started env: TEST1: true - force_kill: yes + force_kill: true register: env_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1708,7 +1708,7 @@ env: TEST1: val1 TEST3: val3 - force_kill: yes + force_kill: true register: env_file_4 - name: env_file (with env, idempotent) @@ -1732,15 +1732,15 @@ env: TEST2: val2 TEST4: val4alt - force_kill: yes + force_kill: true register: env_file_6 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1804,15 +1804,15 @@ etc_hosts: example.com: 1.2.3.4 example.us: 1.2.3.5 - force_kill: yes + force_kill: true register: etc_hosts_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1866,15 +1866,15 @@ exposed_ports: - "9002" - "9003" - force_kill: yes + force_kill: true register: exposed_ports_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1934,15 +1934,15 @@ groups: - "1234" - "2345" - force_kill: yes + force_kill: true register: groups_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -1969,7 +1969,7 @@ timeout: 2s interval: 0h0m2s3ms4us retries: 2 - force_kill: yes + force_kill: true register: healthcheck_1 - name: healthcheck (idempotency) @@ -1986,7 +1986,7 @@ timeout: 2s interval: 0h0m2s3ms4us retries: 2 - force_kill: yes + force_kill: true register: healthcheck_2 - name: healthcheck (changed) @@ -2003,7 +2003,7 @@ timeout: 3s interval: 0h1m2s3ms4us retries: 3 - force_kill: yes + force_kill: true register: healthcheck_3 - name: healthcheck (no change) @@ -2012,7 +2012,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: healthcheck_4 - name: healthcheck (disabled) @@ -2024,7 +2024,7 @@ healthcheck: test: - NONE - force_kill: yes + force_kill: true register: healthcheck_5 - name: healthcheck (disabled, idempotency) @@ -2036,7 +2036,7 @@ healthcheck: test: - NONE - force_kill: yes + force_kill: true register: healthcheck_6 - name: healthcheck (disabled, idempotency, strict) @@ -2048,7 +2048,7 @@ healthcheck: test: - NONE - force_kill: yes + force_kill: true comparisons: '*': strict register: healthcheck_7 @@ -2061,7 +2061,7 @@ state: started healthcheck: test: "sleep 1" - force_kill: yes + force_kill: true register: healthcheck_8 - name: healthcheck (string in healthcheck test, idempotency) @@ -2072,15 +2072,15 @@ state: started healthcheck: test: "sleep 1" - force_kill: yes + force_kill: true register: healthcheck_9 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2123,15 +2123,15 @@ name: "{{ cname }}" hostname: me.example.org state: started - force_kill: yes + force_kill: true register: hostname_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2148,7 +2148,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - init: yes + init: true state: started register: init_1 @@ -2157,7 +2157,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - init: yes + init: true state: started register: init_2 @@ -2166,17 +2166,17 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - init: no + init: false state: started - force_kill: yes + force_kill: true register: init_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2193,7 +2193,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - interactive: yes + interactive: true state: started register: interactive_1 @@ -2202,7 +2202,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - interactive: yes + interactive: true state: started register: interactive_2 @@ -2211,17 +2211,17 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - interactive: no + interactive: false state: started - force_kill: yes + force_kill: true register: interactive_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2288,7 +2288,7 @@ image_comparison: desired-image name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: ignore_image_3 diff: true @@ -2297,7 +2297,7 @@ image: "{{ docker_test_image_hello_world }}" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: image_change diff: true @@ -2305,8 +2305,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2379,7 +2379,7 @@ labels: img_label: override state: started - force_kill: yes + force_kill: true register: image_label_mismatch_5 - name: image_label_mismatch (ignore,remove img label) @@ -2390,7 +2390,7 @@ image_label_mismatch: ignore labels: {} state: started - force_kill: yes + force_kill: true register: image_label_mismatch_6 - name: image_label_mismatch (fail,unmanaged labels) @@ -2422,7 +2422,7 @@ labels: strict labels: {} state: started - ignore_errors: yes + ignore_errors: true register: image_label_mismatch_9 - name: image_label_mismatch (fail,match img label) @@ -2445,21 +2445,21 @@ labels: img_label: override state: started - force_kill: yes + force_kill: true register: image_label_mismatch_11 - name: cleanup container docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - name: cleanup image docker_image: name: "{{ iname_labels }}" state: absent - diff: no + diff: false - assert: that: @@ -2513,7 +2513,7 @@ - name: ignore_image docker_container: image: "{{ docker_test_image_hello_world }}" - ignore_image: yes + ignore_image: true name: "{{ cname }}" state: started register: ignore_image @@ -2522,7 +2522,7 @@ - name: ignore_image (labels and env differ in image, image_comparison=current-image) docker_container: image: "{{ docker_test_image_registry_nginx }}" - ignore_image: yes + ignore_image: true image_comparison: current-image name: "{{ cname }}" state: started @@ -2532,11 +2532,11 @@ - name: ignore_image (labels and env differ in image, image_comparison=desired-image) docker_container: image: "{{ docker_test_image_registry_nginx }}" - ignore_image: yes + ignore_image: true image_comparison: desired-image name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: ignore_image_3 diff: true @@ -2545,7 +2545,7 @@ image: "{{ docker_test_image_hello_world }}" name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: image_change diff: true @@ -2553,8 +2553,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2606,21 +2606,21 @@ name: "{{ cname }}" image_name_mismatch: recreate state: started - force_kill: yes + force_kill: true register: image_name_mismatch_3 - name: Cleanup container docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - name: Cleanup image docker_image: name: "{{ iname_name_mismatch }}" state: absent - diff: no + diff: false - assert: that: @@ -2672,20 +2672,20 @@ name: "{{ cname }}" state: started ipc_mode: private - force_kill: yes + force_kill: true register: ipc_mode_3 - name: cleanup docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname_h1 }}" loop_control: loop_var: container_name - diff: no + diff: false - assert: that: @@ -2705,7 +2705,7 @@ kernel_memory: 8M state: started register: kernel_memory_1 - ignore_errors: yes + ignore_errors: true - name: kernel_memory (idempotency) docker_container: @@ -2715,7 +2715,7 @@ kernel_memory: 8M state: started register: kernel_memory_2 - ignore_errors: yes + ignore_errors: true - name: kernel_memory (change) docker_container: @@ -2724,16 +2724,16 @@ name: "{{ cname }}" kernel_memory: 6M state: started - force_kill: yes + force_kill: true register: kernel_memory_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2797,15 +2797,15 @@ labels: ansible.test.1: hello ansible.test.3: ansible - force_kill: yes + force_kill: true register: labels_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2872,14 +2872,14 @@ links: - "{{ cname_h1 }}:test1" - "{{ cname_h3 }}:test3" - force_kill: yes + force_kill: true register: links_4 - name: cleanup docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname_h1 }}" @@ -2887,7 +2887,7 @@ - "{{ cname_h3 }}" loop_control: loop_var: container_name - diff: no + diff: false - assert: that: @@ -2925,15 +2925,15 @@ name: "{{ cname }}" state: started log_driver: syslog - force_kill: yes + force_kill: true register: log_driver_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -2992,15 +2992,15 @@ log_options: labels: production_status max-size: 10m - force_kill: yes + force_kill: true register: log_options_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3040,15 +3040,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" mac_address: 92:d0:c6:0a:29:44 state: started - force_kill: yes + force_kill: true register: mac_address_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3085,15 +3085,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" memory: 48M state: started - force_kill: yes + force_kill: true register: memory_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3130,15 +3130,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" memory_reservation: 48M state: started - force_kill: yes + force_kill: true register: memory_reservation_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3159,7 +3159,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau memory: 32M memory_swap: 64M state: started - debug: yes + debug: true register: memory_swap_1 - name: memory_swap (idempotency) @@ -3171,7 +3171,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau memory: 32M memory_swap: 64M state: started - debug: yes + debug: true register: memory_swap_2 - name: memory_swap (change) @@ -3183,8 +3183,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau memory: 32M memory_swap: 48M state: started - force_kill: yes - debug: yes + force_kill: true + debug: true register: memory_swap_3 - name: memory_swap (unlimited) @@ -3196,8 +3196,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau memory: 32M memory_swap: unlimited state: started - force_kill: yes - debug: yes + force_kill: true + debug: true register: memory_swap_4 - name: memory_swap (unlimited via -1) @@ -3209,16 +3209,16 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau memory: 32M memory_swap: -1 state: started - force_kill: yes - debug: yes + force_kill: true + debug: true register: memory_swap_5 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3269,15 +3269,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" memory_swappiness: 60 state: started - force_kill: yes + force_kill: true register: memory_swappiness_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3295,7 +3295,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - oom_killer: yes + oom_killer: true state: started register: oom_killer_1 @@ -3304,7 +3304,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - oom_killer: yes + oom_killer: true state: started register: oom_killer_2 @@ -3313,17 +3313,17 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - oom_killer: no + oom_killer: false state: started - force_kill: yes + force_kill: true register: oom_killer_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3361,15 +3361,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" oom_score_adj: 7 state: started - force_kill: yes + force_kill: true register: oom_score_adj_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3394,8 +3394,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau command: "/bin/sh -c 'sleep 10m'" name: "{{ cname }}" state: started - paused: yes - force_kill: yes + paused: true + force_kill: true register: paused_1 - name: inspect paused @@ -3408,8 +3408,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau command: "/bin/sh -c 'sleep 10m'" name: "{{ cname }}" state: started - paused: yes - force_kill: yes + paused: true + force_kill: true register: paused_3 - name: paused (continue) @@ -3418,8 +3418,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau command: "/bin/sh -c 'sleep 10m'" name: "{{ cname }}" state: started - paused: no - force_kill: yes + paused: false + force_kill: true register: paused_4 - name: inspect paused @@ -3430,8 +3430,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3478,20 +3478,20 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" state: started pid_mode: host - force_kill: yes + force_kill: true register: pid_mode_3 - name: cleanup docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname_h1 }}" loop_control: loop_var: container_name - diff: no + diff: false - assert: that: @@ -3528,15 +3528,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" state: started pids_limit: 20 - force_kill: yes + force_kill: true register: pids_limit_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3562,7 +3562,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau platform: linux/amd64 debug: true register: platform_1 - ignore_errors: yes + ignore_errors: true - name: platform (idempotency) docker_container: @@ -3573,7 +3573,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau platform: linux debug: true register: platform_2 - ignore_errors: yes + ignore_errors: true - name: platform (changed) docker_container: @@ -3582,20 +3582,20 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau state: present pull: true platform: linux/386 - force_kill: yes + force_kill: true debug: true comparisons: # Do not restart because of the changed image ID image: ignore register: platform_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3619,7 +3619,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - privileged: yes + privileged: true state: started register: privileged_1 @@ -3628,7 +3628,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - privileged: yes + privileged: true state: started register: privileged_2 @@ -3637,17 +3637,17 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - privileged: no + privileged: false state: started - force_kill: yes + force_kill: true register: privileged_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3700,7 +3700,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau published_ports: - '9002' - '9003' - force_kill: yes + force_kill: true register: published_ports_4 - name: published_ports (ports with IP addresses) @@ -3713,7 +3713,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau - '127.0.0.1:9002:9002/tcp' - '[::1]:9003:9003/tcp' - '[fe80::1%test]:90:90/tcp' - force_kill: yes + force_kill: true register: published_ports_5 - name: published_ports (ports with IP addresses, idempotent) @@ -3737,7 +3737,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau published_ports: [] comparisons: published_ports: strict - force_kill: yes + force_kill: true register: published_ports_7 - name: published_ports (default_host_ip not set) @@ -3749,7 +3749,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau published_ports: - '9001' - '9002' - force_kill: yes + force_kill: true register: published_ports_8 - name: published_ports (default_host_ip set to empty string) @@ -3762,7 +3762,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau - '9002' - '9001' default_host_ip: '' - force_kill: yes + force_kill: true register: published_ports_9 - name: published_ports (default_host_ip set to empty string, idempotent) @@ -3786,15 +3786,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau published_ports: - '9002' - '9001' - force_kill: yes + force_kill: true register: published_ports_11 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3825,7 +3825,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - read_only: yes + read_only: true state: started register: read_only_1 @@ -3834,7 +3834,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - read_only: yes + read_only: true state: started register: read_only_2 @@ -3843,17 +3843,17 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - read_only: no + read_only: false state: started - force_kill: yes + force_kill: true register: read_only_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3890,15 +3890,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" restart_policy: unless-stopped state: started - force_kill: yes + force_kill: true register: restart_policy_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3938,15 +3938,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau restart_policy: on-failure restart_retries: 2 state: started - force_kill: yes + force_kill: true register: restart_retries_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -3980,8 +3980,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4049,15 +4049,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau security_opts: - "label:disable" - "no-new-privileges" - force_kill: yes + force_kill: true register: security_opts_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4095,15 +4095,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" shm_size: 75M state: started - force_kill: yes + force_kill: true register: shm_size_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4140,15 +4140,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" stop_signal: "9" state: started - force_kill: yes + force_kill: true register: stop_signal_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4192,8 +4192,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4214,7 +4214,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau size: 12m state: started register: storage_opts_1 - ignore_errors: yes + ignore_errors: true - name: storage_opts (idempotency) docker_container: @@ -4225,7 +4225,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau size: 12m state: started register: storage_opts_2 - ignore_errors: yes + ignore_errors: true - name: storage_opts (change) docker_container: @@ -4235,16 +4235,16 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau storage_opts: size: 24m state: started - force_kill: yes + force_kill: true register: storage_opts_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4315,15 +4315,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau sysctls: net.ipv4.icmp_echo_ignore_all: 1 net.ipv6.conf.default.accept_redirects: 0 - force_kill: yes + force_kill: true register: sysctls_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4377,15 +4377,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau tmpfs: - "/test1:rw,noexec,nosuid,size=65536k" - "/test3:rw,noexec,nosuid,size=65536k" - force_kill: yes + force_kill: true register: tmpfs_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4403,7 +4403,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - tty: yes + tty: true state: started register: tty_1 ignore_errors: true @@ -4413,7 +4413,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - tty: yes + tty: true state: started register: tty_2 ignore_errors: true @@ -4423,9 +4423,9 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - tty: no + tty: false state: started - force_kill: yes + force_kill: true register: tty_3 ignore_errors: true @@ -4433,8 +4433,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4494,15 +4494,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau ulimits: - "nofile:1234:1234" - "sigpending:100:200" - force_kill: yes + force_kill: true register: ulimits_4 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4540,15 +4540,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" user: root state: started - force_kill: yes + force_kill: true register: user_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4585,15 +4585,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" userns_mode: "" state: started - force_kill: yes + force_kill: true register: userns_mode_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4630,15 +4630,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" uts: "" state: started - force_kill: yes + force_kill: true register: uts_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -4675,15 +4675,15 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau name: "{{ cname }}" working_dir: / state: started - force_kill: yes + force_kill: true register: working_dir_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: diff --git a/tests/integration/targets/docker_container/tasks/tests/ports.yml b/tests/integration/targets/docker_container/tasks/tests/ports.yml index 3db6fbb0..ced86851 100644 --- a/tests/integration/targets/docker_container/tasks/tests/ports.yml +++ b/tests/integration/targets/docker_container/tasks/tests/ports.yml @@ -73,7 +73,7 @@ published_ports: - "9001:9001" - "9010-9050:9010-9050" - force_kill: yes + force_kill: true register: published_ports_1 - name: published_ports -- port range (idempotency) @@ -88,7 +88,7 @@ published_ports: - "9001:9001" - "9010-9050:9010-9050" - force_kill: yes + force_kill: true register: published_ports_2 - name: published_ports -- port range (different range) @@ -103,15 +103,15 @@ published_ports: - "9001:9001" - "9020-9060:9020-9060" - force_kill: yes + force_kill: true register: published_ports_3 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -131,7 +131,7 @@ state: started published_ports: - "9010-9050:9010" - force_kill: yes + force_kill: true loop: - '{{ cname }}' - '{{ cname2 }}' @@ -145,7 +145,7 @@ state: started published_ports: - "9010-9050:9010" - force_kill: yes + force_kill: true loop: - '{{ cname }}' - '{{ cname2 }}' @@ -159,7 +159,7 @@ state: started published_ports: - "9010-9051:9010" - force_kill: yes + force_kill: true loop: - '{{ cname }}' - '{{ cname2 }}' @@ -169,11 +169,11 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true loop: - '{{ cname }}' - '{{ cname2 }}' - diff: no + diff: false - assert: that: @@ -193,7 +193,7 @@ state: started published_ports: - "[::1]:9001:9001" - force_kill: yes + force_kill: true register: published_ports_1 - name: published_ports -- IPv6 (idempotency) @@ -204,7 +204,7 @@ state: started published_ports: - "[::1]:9001:9001" - force_kill: yes + force_kill: true register: published_ports_2 - name: published_ports -- IPv6 (different IP) @@ -215,7 +215,7 @@ state: started published_ports: - "127.0.0.1:9001:9001" - force_kill: yes + force_kill: true register: published_ports_3 - name: published_ports -- IPv6 (hostname) @@ -226,16 +226,16 @@ state: started published_ports: - "localhost:9001:9001" - force_kill: yes + force_kill: true register: published_ports_4 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -311,7 +311,7 @@ state: started publish_all_ports: "{{ test_case.publish_all_ports_value | default(omit) }}" published_ports: "{{ test_case.published_ports_value | default(omit) }}" - force_kill: yes + force_kill: true register: publish_all_ports loop_control: loop_var: test_case diff --git a/tests/integration/targets/docker_container/tasks/tests/regression-45700-dont-parse-on-absent.yml b/tests/integration/targets/docker_container/tasks/tests/regression-45700-dont-parse-on-absent.yml index b57677dd..928463ae 100644 --- a/tests/integration/targets/docker_container/tasks/tests/regression-45700-dont-parse-on-absent.yml +++ b/tests/integration/targets/docker_container/tasks/tests/regression-45700-dont-parse-on-absent.yml @@ -21,7 +21,7 @@ - name: Stop container with a lot of invalid options docker_container: name: "{{ cname }}" - force_kill: yes + force_kill: true # Some options with "invalid" values, which would # have to be parsed. The values are "invalid" because # the containers and networks listed here do not exist. diff --git a/tests/integration/targets/docker_container/tasks/tests/start-stop.yml b/tests/integration/targets/docker_container/tasks/tests/start-stop.yml index d7423261..97ac38a5 100644 --- a/tests/integration/targets/docker_container/tasks/tests/start-stop.yml +++ b/tests/integration/targets/docker_container/tasks/tests/start-stop.yml @@ -20,7 +20,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: present - check_mode: yes + check_mode: true register: create_1 - name: Create container @@ -45,7 +45,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: present - check_mode: yes + check_mode: true register: create_4 - assert: @@ -63,7 +63,7 @@ docker_container: name: "{{ cname }}" state: started - check_mode: yes + check_mode: true register: start_1 - name: Start container @@ -82,7 +82,7 @@ docker_container: name: "{{ cname }}" state: started - check_mode: yes + check_mode: true register: start_4 - assert: @@ -102,7 +102,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: present - check_mode: yes + check_mode: true register: present_check_1 - name: Present check for running container @@ -126,7 +126,7 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true - name: Start container from scratch (check) docker_container: @@ -135,7 +135,7 @@ stop_timeout: 1 name: "{{ cname }}" state: started - check_mode: yes + check_mode: true register: start_scratch_1 - name: Start container from scratch @@ -163,7 +163,7 @@ stop_timeout: 1 name: "{{ cname }}" state: started - check_mode: yes + check_mode: true register: start_scratch_4 - assert: @@ -183,7 +183,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: present - force_kill: yes + force_kill: true register: recreate_1 - name: Recreating container (created, recreate, check mode) @@ -191,20 +191,20 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - recreate: yes + recreate: true state: present - force_kill: yes + force_kill: true register: recreate_2 - check_mode: yes + check_mode: true - name: Recreating container (created, recreate) docker_container: image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - recreate: yes + recreate: true state: present - force_kill: yes + force_kill: true register: recreate_3 - name: Recreating container (started) @@ -213,7 +213,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - force_kill: yes + force_kill: true register: recreate_4 - name: Recreating container (started, recreate, check mode) @@ -221,30 +221,30 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - recreate: yes + recreate: true removal_wait_timeout: 10 state: started - force_kill: yes + force_kill: true register: recreate_5 - check_mode: yes + check_mode: true - name: Recreating container (started, recreate) docker_container: image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - recreate: yes + recreate: true removal_wait_timeout: 10 state: started - force_kill: yes + force_kill: true register: recreate_6 - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - debug: var=recreate_1 - debug: var=recreate_3 @@ -284,22 +284,22 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - restart: yes + restart: true state: started stop_timeout: 1 - force_kill: yes + force_kill: true register: restart_2 - check_mode: yes + check_mode: true - name: Restarting (restart) docker_container: image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" - restart: yes + restart: true state: started stop_timeout: 1 - force_kill: yes + force_kill: true register: restart_3 - name: Restarting (verify volumes) @@ -317,8 +317,8 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - assert: that: @@ -338,7 +338,7 @@ name: "{{ cname }}" state: stopped stop_timeout: 1 - check_mode: yes + check_mode: true register: stop_1 - name: Stop container @@ -363,7 +363,7 @@ name: "{{ cname }}" state: stopped stop_timeout: 1 - check_mode: yes + check_mode: true register: stop_4 - assert: @@ -381,7 +381,7 @@ docker_container: name: "{{ cname }}" state: absent - check_mode: yes + check_mode: true register: remove_1 - name: Remove container @@ -400,7 +400,7 @@ docker_container: name: "{{ cname }}" state: absent - check_mode: yes + check_mode: true register: remove_4 - assert: @@ -425,30 +425,30 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes - check_mode: yes + force_kill: true + check_mode: true register: remove_from_running_1 - name: Remove container from running docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true register: remove_from_running_2 - name: Remove container from running (idempotent) docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true register: remove_from_running_3 - name: Remove container from running (idempotent check) docker_container: name: "{{ cname }}" state: absent - force_kill: yes - check_mode: yes + force_kill: true + check_mode: true register: remove_from_running_4 - assert: diff --git a/tests/integration/targets/docker_container/tasks/tests/update.yml b/tests/integration/targets/docker_container/tasks/tests/update.yml index 106e6d4b..a180e0f5 100644 --- a/tests/integration/targets/docker_container/tasks/tests/update.yml +++ b/tests/integration/targets/docker_container/tasks/tests/update.yml @@ -82,7 +82,7 @@ restart_policy: on-failure # only on-failure can have restart_retries, so don't change it here restart_retries: 2 register: update - diff: yes + diff: true - name: Update values again docker_container: @@ -100,7 +100,7 @@ restart_policy: always restart_retries: 0 register: update2 - diff: yes + diff: true - name: Recreate container docker_container: @@ -117,16 +117,16 @@ memory_swap: unlimited restart_policy: on-failure restart_retries: 2 - force_kill: yes + force_kill: true register: recreate - diff: yes + diff: true - name: cleanup docker_container: name: "{{ cname }}" state: absent - force_kill: yes - diff: no + force_kill: true + diff: false - name: Check general things assert: diff --git a/tests/integration/targets/docker_container_copy_into/tasks/tests/content.yml b/tests/integration/targets/docker_container_copy_into/tasks/tests/content.yml index ae22af00..b49c05a9 100644 --- a/tests/integration/targets/docker_container_copy_into/tasks/tests/content.yml +++ b/tests/integration/targets/docker_container_copy_into/tasks/tests/content.yml @@ -1194,4 +1194,4 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true diff --git a/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml b/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml index 8181d125..5431ae35 100644 --- a/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml +++ b/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml @@ -1062,4 +1062,4 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true diff --git a/tests/integration/targets/docker_container_exec/tasks/main.yml b/tests/integration/targets/docker_container_exec/tasks/main.yml index 2cf0e5a1..61c3b81e 100644 --- a/tests/integration/targets/docker_container_exec/tasks/main.yml +++ b/tests/integration/targets/docker_container_exec/tasks/main.yml @@ -17,7 +17,7 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true - name: Execute in a non-present container docker_container_exec: @@ -37,7 +37,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' state: started - force_kill: yes + force_kill: true - name: Execute in a present container (command) docker_container_exec: @@ -220,7 +220,7 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true when: docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_container_info/tasks/main.yml b/tests/integration/targets/docker_container_info/tasks/main.yml index 80f03b85..2df597eb 100644 --- a/tests/integration/targets/docker_container_info/tasks/main.yml +++ b/tests/integration/targets/docker_container_info/tasks/main.yml @@ -17,7 +17,7 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true - name: Inspect a non-present container docker_container_info: @@ -36,7 +36,7 @@ image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' state: started - force_kill: yes + force_kill: true - name: Inspect a present container docker_container_info: @@ -48,7 +48,7 @@ - name: "Comparison: use 'docker inspect'" command: docker inspect "{{ cname }}" register: docker_inspect - ignore_errors: yes + ignore_errors: true - block: - set_fact: docker_inspect_result: "{{ docker_inspect.stdout | from_json }}" @@ -76,7 +76,7 @@ docker_container: name: "{{ cname }}" state: absent - force_kill: yes + force_kill: true when: docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_host_info/tasks/test_host_info.yml b/tests/integration/targets/docker_host_info/tasks/test_host_info.yml index 02d102c6..0d090db9 100644 --- a/tests/integration/targets/docker_host_info/tasks/test_host_info.yml +++ b/tests/integration/targets/docker_host_info/tasks/test_host_info.yml @@ -68,7 +68,7 @@ - name: Get info on Docker host and list containers docker_host_info: - containers: yes + containers: true register: output - name: assert reading docker host facts when docker is running and list containers @@ -84,7 +84,7 @@ - name: Get info on Docker host and list containers matching filters (single label) docker_host_info: - containers: yes + containers: true containers_filters: label: key1=value1 register: output @@ -95,7 +95,7 @@ - name: Get info on Docker host and list containers matching filters (multiple labels) docker_host_info: - containers: yes + containers: true containers_filters: label: - key1=value1 @@ -108,7 +108,7 @@ - name: Get info on Docker host and do not list containers which do not match filters docker_host_info: - containers: yes + containers: true containers_filters: label: - key1=value1 @@ -144,8 +144,8 @@ - name: Get info on Docker host and list containers with verbose output docker_host_info: - containers: yes - verbose_output: yes + containers: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and list containers with verbose output @@ -161,7 +161,7 @@ - name: Get info on Docker host and list images docker_host_info: - images: yes + images: true register: output - name: assert reading docker host facts when docker is running and list images @@ -177,8 +177,8 @@ - name: Get info on Docker host and list images with verbose output docker_host_info: - images: yes - verbose_output: yes + images: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and list images with verbose output @@ -194,7 +194,7 @@ - name: Get info on Docker host and list networks docker_host_info: - networks: yes + networks: true register: output - name: assert reading docker host facts when docker is running and list networks @@ -210,8 +210,8 @@ - name: Get info on Docker host and list networks with verbose output docker_host_info: - networks: yes - verbose_output: yes + networks: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and list networks with verbose output @@ -227,7 +227,7 @@ - name: Get info on Docker host and list volumes docker_host_info: - volumes: yes + volumes: true register: output - name: assert reading docker host facts when docker is running and list volumes @@ -243,8 +243,8 @@ - name: Get info on Docker host and list volumes with verbose output docker_host_info: - volumes: yes - verbose_output: yes + volumes: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and list volumes with verbose output @@ -260,7 +260,7 @@ - name: Get info on Docker host and get disk usage docker_host_info: - disk_usage: yes + disk_usage: true register: output - name: assert reading docker host facts when docker is running and get disk usage @@ -278,8 +278,8 @@ - name: Get info on Docker host and get disk usage with verbose output docker_host_info: - disk_usage: yes - verbose_output: yes + disk_usage: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and get disk usage with verbose output @@ -297,11 +297,11 @@ - name: Get info on Docker host, disk usage and get all lists together docker_host_info: - volumes: yes - containers: yes - networks: yes - images: yes - disk_usage: yes + volumes: true + containers: true + networks: true + images: true + disk_usage: true register: output - name: assert reading docker host facts when docker is running, disk usage and get lists together @@ -323,12 +323,12 @@ - name: Get info on Docker host, disk usage and get all lists together with verbose output docker_host_info: - volumes: yes - containers: yes - networks: yes - images: yes - disk_usage: yes - verbose_output: yes + volumes: true + containers: true + networks: true + images: true + disk_usage: true + verbose_output: true register: output - name: assert reading docker host facts when docker is running and get disk usage with verbose output @@ -353,7 +353,7 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname }}" - "{{ cname2 }}" diff --git a/tests/integration/targets/docker_image/tasks/test.yml b/tests/integration/targets/docker_image/tasks/test.yml index 5941bc08..50bb84ff 100644 --- a/tests/integration/targets/docker_image/tasks/test.yml +++ b/tests/integration/targets/docker_image/tasks/test.yml @@ -45,7 +45,7 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true with_items: "{{ cnames }}" when: docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_image/tasks/tests/basic.yml b/tests/integration/targets/docker_image/tasks/tests/basic.yml index a6954274..78b4f773 100644 --- a/tests/integration/targets/docker_image/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_image/tasks/tests/basic.yml @@ -11,7 +11,7 @@ docker_image: name: "{{ docker_test_image_hello_world }}" state: absent - force_absent: yes + force_absent: true register: absent_1 - name: Make sure image is not there (idempotency) @@ -71,7 +71,7 @@ source: local name: "{{ docker_test_image_hello_world }}" repository: "{{ docker_test_image_hello_world_base }}:alias" - force_tag: yes + force_tag: true register: tag_3 - name: Tag image with ID instead of name @@ -125,7 +125,7 @@ path: "{{ remote_tmp_dir }}/files" force_source: true register: fail_4 - ignore_errors: yes + ignore_errors: true - assert: that: diff --git a/tests/integration/targets/docker_image/tasks/tests/docker_image.yml b/tests/integration/targets/docker_image/tasks/tests/docker_image.yml index 8035525b..a13eb691 100644 --- a/tests/integration/targets/docker_image/tasks/tests/docker_image.yml +++ b/tests/integration/targets/docker_image/tasks/tests/docker_image.yml @@ -24,7 +24,7 @@ docker_image: name: "{{ hello_world_image_base }}:latest" state: absent - force_absent: yes + force_absent: true - name: Make sure we have {{ docker_test_image_hello_world }} docker_image: @@ -35,7 +35,7 @@ docker_image: name: "{{ docker_test_image_hello_world }}" repository: "{{ hello_world_image_base }}:latest" - push: yes + push: true source: local register: push_1 @@ -43,7 +43,7 @@ docker_image: name: "{{ docker_test_image_hello_world }}" repository: "{{ hello_world_image_base }}:latest" - push: yes + push: true source: local register: push_2 @@ -51,9 +51,9 @@ docker_image: name: "{{ docker_test_image_hello_world }}" repository: "{{ hello_world_image_base }}:latest" - push: yes + push: true source: local - force_tag: yes + force_tag: true register: push_3 - assert: @@ -71,7 +71,7 @@ docker_image: name: "{{ hello_world_image_base }}:latest" state: absent - force_absent: yes + force_absent: true - name: Get facts of local image (absent) docker_image_info: @@ -122,7 +122,7 @@ docker_image: name: "{{ docker_test_image_alpine_different }}" repository: "{{ hello_world_image_base }}:newtag" - push: no + push: false source: pull - name: Push different image with new tag @@ -130,7 +130,7 @@ name: "{{ hello_world_image_base }}" repository: "{{ hello_world_image_base }}" tag: newtag - push: yes + push: true source: local register: push_1_different @@ -139,7 +139,7 @@ name: "{{ hello_world_image_base }}" repository: "{{ hello_world_image_base }}" tag: newtag - push: yes + push: true source: local register: push_2_different @@ -152,7 +152,7 @@ docker_image: name: "{{ docker_test_image_alpine_different }}" repository: "{{ hello_world_image_base }}:newtag2" - push: no + push: false source: pull - name: Push same image with new tag @@ -160,7 +160,7 @@ name: "{{ hello_world_image_base }}" repository: "{{ hello_world_image_base }}" tag: newtag2 - push: yes + push: true source: local register: push_1_same @@ -169,7 +169,7 @@ name: "{{ hello_world_image_base }}" repository: "{{ hello_world_image_base }}" tag: newtag2 - push: yes + push: true source: local register: push_2_same @@ -202,14 +202,14 @@ docker_image: name: "{{ test_image_base }}:latest" state: absent - force_absent: yes + force_absent: true - name: repository docker_image: name: "{{ iname }}" build: path: "{{ remote_tmp_dir }}/files" - pull: no + pull: false repository: "{{ test_image_base }}" source: build register: repository_1 @@ -252,7 +252,7 @@ docker_image: name: "{{ test_image_base }}:latest" state: absent - force_absent: yes + force_absent: true - assert: that: diff --git a/tests/integration/targets/docker_image/tasks/tests/options.yml b/tests/integration/targets/docker_image/tasks/tests/options.yml index 401ee786..0670f133 100644 --- a/tests/integration/targets/docker_image/tasks/tests/options.yml +++ b/tests/integration/targets/docker_image/tasks/tests/options.yml @@ -21,7 +21,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - name: buildargs docker_image: @@ -34,10 +34,10 @@ TEST1: val1 TEST2: val2 TEST3: "True" - pull: no + pull: false source: build register: buildargs_1 - ignore_errors: yes + ignore_errors: true - name: buildargs (idempotency) docker_image: @@ -50,16 +50,16 @@ TEST1: val1 TEST2: val2 TEST3: "True" - pull: no + pull: false source: build register: buildargs_2 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -77,9 +77,9 @@ path: "{{ remote_tmp_dir }}/files" container_limits: memory: 4000 - pull: no + pull: false source: build - ignore_errors: yes + ignore_errors: true register: container_limits_1 - name: container_limits @@ -90,7 +90,7 @@ container_limits: memory: 7000000 memswap: 8000000 - pull: no + pull: false source: build register: container_limits_2 @@ -98,7 +98,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -121,7 +121,7 @@ build: path: "{{ remote_tmp_dir }}/files" dockerfile: "MyDockerfile" - pull: no + pull: false source: build register: dockerfile_1 @@ -129,7 +129,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -145,7 +145,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - name: build.platform docker_image: @@ -153,10 +153,10 @@ build: path: "{{ remote_tmp_dir }}/files" platform: linux - pull: no + pull: false source: build register: platform_1 - ignore_errors: yes + ignore_errors: true - name: build.platform (idempotency) docker_image: @@ -164,16 +164,16 @@ build: path: "{{ remote_tmp_dir }}/files" platform: linux - pull: no + pull: false source: build register: platform_2 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -189,7 +189,7 @@ name: "{{ iname }}" build: path: "{{ remote_tmp_dir }}/files" - pull: no + pull: false source: build - name: force (changed) @@ -198,9 +198,9 @@ build: path: "{{ remote_tmp_dir }}/files" dockerfile: "MyDockerfile" - pull: no + pull: false source: build - force_source: yes + force_source: true register: force_1 - name: force (unchanged) @@ -209,16 +209,16 @@ build: path: "{{ remote_tmp_dir }}/files" dockerfile: "MyDockerfile" - pull: no + pull: false source: build - force_source: yes + force_source: true register: force_2 - name: cleanup docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -309,7 +309,7 @@ docker_image: name: "{{ docker_test_image_hello_world }}" state: absent - force_absent: yes + force_absent: true - name: load image (changed) docker_image: @@ -369,7 +369,7 @@ name: "{{ iname }}" build: path: "{{ remote_tmp_dir }}/files" - pull: no + pull: false source: build register: path_1 @@ -378,7 +378,7 @@ name: "{{ iname }}" build: path: "{{ remote_tmp_dir }}/files" - pull: no + pull: false source: build register: path_2 @@ -386,7 +386,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -404,7 +404,7 @@ path: "{{ remote_tmp_dir }}/files" dockerfile: "StagedDockerfile" target: first - pull: no + pull: false source: build register: dockerfile_2 @@ -412,7 +412,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: @@ -429,7 +429,7 @@ build: path: "{{ remote_tmp_dir }}/files" dockerfile: "EtcHostsDockerfile" - pull: no + pull: false etc_hosts: some-custom-host: "127.0.0.1" source: build @@ -439,7 +439,7 @@ docker_image: name: "{{ iname }}" state: absent - force_absent: yes + force_absent: true - assert: that: diff --git a/tests/integration/targets/docker_image_load/tasks/test.yml b/tests/integration/targets/docker_image_load/tasks/test.yml index 3563419d..a56c9530 100644 --- a/tests/integration/targets/docker_image_load/tasks/test.yml +++ b/tests/integration/targets/docker_image_load/tasks/test.yml @@ -29,7 +29,7 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true with_items: "{{ cnames }}" when: docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_login/tasks/tests/docker_login.yml b/tests/integration/targets/docker_login/tasks/tests/docker_login.yml index 84ba3d87..efb3efc1 100644 --- a/tests/integration/targets/docker_login/tasks/tests/docker_login.yml +++ b/tests/integration/targets/docker_login/tasks/tests/docker_login.yml @@ -18,8 +18,8 @@ password: "1234" state: present register: login_failed_check - ignore_errors: yes - check_mode: yes + ignore_errors: true + check_mode: true - name: Log in with wrong password docker_login: @@ -28,7 +28,7 @@ password: "1234" state: present register: login_failed - ignore_errors: yes + ignore_errors: true - name: Make sure that login failed assert: @@ -45,7 +45,7 @@ password: hunter2 state: present register: login_1 - check_mode: yes + check_mode: true - name: Log in docker_login: @@ -75,7 +75,7 @@ password: hunter2 state: present register: login_4 - check_mode: yes + check_mode: true - name: Make sure that login worked assert: @@ -93,8 +93,8 @@ password: "1234" state: present register: login_failed_check - ignore_errors: yes - check_mode: yes + ignore_errors: true + check_mode: true - name: Log in again with wrong password docker_login: @@ -103,7 +103,7 @@ password: "1234" state: present register: login_failed - ignore_errors: yes + ignore_errors: true - name: Make sure that login failed again assert: @@ -118,7 +118,7 @@ registry_url: "{{ registry_frontend_address }}" state: absent register: logout_1 - check_mode: yes + check_mode: true - name: Log out docker_login: @@ -137,7 +137,7 @@ registry_url: "{{ registry_frontend_address }}" state: absent register: logout_4 - check_mode: yes + check_mode: true - name: Make sure that login worked assert: diff --git a/tests/integration/targets/docker_network/tasks/main.yml b/tests/integration/targets/docker_network/tasks/main.yml index 4f4fad06..4a056151 100644 --- a/tests/integration/targets/docker_network/tasks/main.yml +++ b/tests/integration/targets/docker_network/tasks/main.yml @@ -37,13 +37,13 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true loop: "{{ cnames }}" - name: "Make sure all networks are removed" docker_network: name: "{{ item }}" state: absent - force: yes + force: true loop: "{{ dnetworks }}" when: docker_api_version is version('1.25', '>=') # FIXME: find out API version! diff --git a/tests/integration/targets/docker_network/tasks/tests/basic.yml b/tests/integration/targets/docker_network/tasks/tests/basic.yml index 4df2f108..1a419c73 100644 --- a/tests/integration/targets/docker_network/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_network/tasks/tests/basic.yml @@ -76,7 +76,7 @@ state: present connected: - "{{ cname_3 }}" - appends: yes + appends: true register: networks_4 - name: Connect network to container 3 (idempotency) @@ -85,7 +85,7 @@ state: present connected: - "{{ cname_3 }}" - appends: yes + appends: true register: networks_4_idem - name: Disconnect network from container 1 @@ -129,7 +129,7 @@ docker_container: name: "{{ container_name }}" state: absent - force_kill: yes + force_kill: true loop: - "{{ cname_1 }}" - "{{ cname_2 }}" diff --git a/tests/integration/targets/docker_network/tasks/tests/ipam.yml b/tests/integration/targets/docker_network/tasks/tests/ipam.yml index 85e77223..7091e95f 100644 --- a/tests/integration/targets/docker_network/tasks/tests/ipam.yml +++ b/tests/integration/targets/docker_network/tasks/tests/ipam.yml @@ -59,7 +59,7 @@ aux_addresses: host1: 10.25.121.3 register: network - diff: yes + diff: true - assert: that: @@ -92,7 +92,7 @@ - name: Create network with IPv6 IPAM config docker_network: name: "{{ nname_ipam_2 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: fdd1:ac8c:0557:7ce0::/64 register: network @@ -104,7 +104,7 @@ - name: Create network with IPv6 IPAM config (idempotence) docker_network: name: "{{ nname_ipam_2 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: fdd1:ac8c:0557:7ce0::/64 register: network @@ -116,11 +116,11 @@ - name: Change subnet of network with IPv6 IPAM config docker_network: name: "{{ nname_ipam_2 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: fdd1:ac8c:0557:7ce1::/64 register: network - diff: yes + diff: true - assert: that: @@ -131,11 +131,11 @@ - name: Change subnet of network with IPv6 IPAM config docker_network: name: "{{ nname_ipam_2 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: "fdd1:ac8c:0557:7ce1::" register: network - ignore_errors: yes + ignore_errors: true - assert: that: @@ -153,7 +153,7 @@ - name: Create network with IPv6 and custom IPv4 IPAM config docker_network: name: "{{ nname_ipam_3 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: 10.26.120.0/24 - subnet: fdd1:ac8c:0557:7ce2::/64 @@ -166,7 +166,7 @@ - name: Change subnet order of network with IPv6 and custom IPv4 IPAM config (idempotence) docker_network: name: "{{ nname_ipam_3 }}" - enable_ipv6: yes + enable_ipv6: true ipam_config: - subnet: fdd1:ac8c:0557:7ce2::/64 - subnet: 10.26.120.0/24 @@ -179,11 +179,11 @@ - name: Remove IPv6 from network with custom IPv4 and IPv6 IPAM config (change) docker_network: name: "{{ nname_ipam_3 }}" - enable_ipv6: no + enable_ipv6: false ipam_config: - subnet: 10.26.120.0/24 register: network - diff: yes + diff: true - assert: that: @@ -240,7 +240,7 @@ - subnet: 10.26.120.0/24 - subnet: 10.26.122.0/24 register: network - diff: yes + diff: true - assert: that: @@ -278,25 +278,25 @@ ipam_driver_options: a: b register: network_1 - ignore_errors: yes + ignore_errors: true - name: Create network with IPAM driver options (idempotence) docker_network: name: "{{ nname_ipam_3 }}" ipam_driver: default ipam_driver_options: a: b - diff: yes + diff: true register: network_2 - ignore_errors: yes + ignore_errors: true - name: Create network with IPAM driver options (change) docker_network: name: "{{ nname_ipam_3 }}" ipam_driver: default ipam_driver_options: a: c - diff: yes + diff: true register: network_3 - ignore_errors: yes + ignore_errors: true - name: Cleanup network docker_network: name: "{{ nname_ipam_3 }}" diff --git a/tests/integration/targets/docker_network/tasks/tests/options.yml b/tests/integration/targets/docker_network/tasks/tests/options.yml index 7dba9129..63315ca4 100644 --- a/tests/integration/targets/docker_network/tasks/tests/options.yml +++ b/tests/integration/targets/docker_network/tasks/tests/options.yml @@ -17,26 +17,26 @@ - name: internal docker_network: name: "{{ nname_1 }}" - internal: yes + internal: true register: internal_1 - name: internal (idempotency) docker_network: name: "{{ nname_1 }}" - internal: yes + internal: true register: internal_2 - name: internal (change) docker_network: name: "{{ nname_1 }}" - internal: no + internal: false register: internal_3 - name: cleanup docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: @@ -87,7 +87,7 @@ docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: @@ -134,7 +134,7 @@ docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: @@ -146,7 +146,7 @@ - name: cleanup swarm docker_swarm: state: absent - force: yes + force: true #################################################################### ## attachable ###################################################### @@ -157,27 +157,27 @@ name: "{{ nname_1 }}" attachable: true register: attachable_1 - ignore_errors: yes + ignore_errors: true - name: attachable (idempotency) docker_network: name: "{{ nname_1 }}" attachable: true register: attachable_2 - ignore_errors: yes + ignore_errors: true - name: attachable (change) docker_network: name: "{{ nname_1 }}" attachable: false register: attachable_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: @@ -224,7 +224,7 @@ docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: diff --git a/tests/integration/targets/docker_network/tasks/tests/overlay.yml b/tests/integration/targets/docker_network/tasks/tests/overlay.yml index 95ce50d1..59d79cc0 100644 --- a/tests/integration/targets/docker_network/tasks/tests/overlay.yml +++ b/tests/integration/targets/docker_network/tasks/tests/overlay.yml @@ -47,7 +47,7 @@ docker_network: name: "{{ nname_1 }}" state: absent - force: yes + force: true - assert: that: @@ -59,4 +59,4 @@ - name: cleanup swarm docker_swarm: state: absent - force: yes + force: true diff --git a/tests/integration/targets/docker_network_info/tasks/main.yml b/tests/integration/targets/docker_network_info/tasks/main.yml index ac80e2ed..910b4ec8 100644 --- a/tests/integration/targets/docker_network_info/tasks/main.yml +++ b/tests/integration/targets/docker_network_info/tasks/main.yml @@ -17,7 +17,7 @@ docker_network: name: "{{ nname }}" state: absent - force: yes + force: true - name: Inspect a non-present network docker_network_info: @@ -45,7 +45,7 @@ - name: "Comparison: use 'docker network inspect'" command: docker network inspect "{{ nname }}" register: docker_inspect - ignore_errors: yes + ignore_errors: true - block: - set_fact: docker_inspect_result: "{{ docker_inspect.stdout | from_json }}" @@ -57,7 +57,7 @@ docker_network: name: "{{ nname }}" state: absent - force: yes + force: true - assert: that: diff --git a/tests/integration/targets/docker_node/tasks/main.yml b/tests/integration/targets/docker_node/tasks/main.yml index cb0f7d3d..68bb5426 100644 --- a/tests/integration/targets/docker_node/tasks/main.yml +++ b/tests/integration/targets/docker_node/tasks/main.yml @@ -17,23 +17,23 @@ docker_swarm: state: absent force: true - diff: no - ignore_errors: yes + diff: false + ignore_errors: true - name: Restart docker daemon service: name: docker state: restarted - become: yes + become: true - name: Wait for docker daemon to be fully restarted command: docker ps - ignore_errors: yes + ignore_errors: true - name: Cleanup docker_swarm: state: absent force: true - diff: no + diff: false when: docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=') diff --git a/tests/integration/targets/docker_node/tasks/test_node.yml b/tests/integration/targets/docker_node/tasks/test_node.yml index 4358fea1..89c9b355 100644 --- a/tests/integration/targets/docker_node/tasks/test_node.yml +++ b/tests/integration/targets/docker_node/tasks/test_node.yml @@ -11,7 +11,7 @@ - name: Try to get docker_node_info when docker is not running in swarm mode docker_node_info: - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called when swarm is not in use or not run on manager node @@ -56,7 +56,7 @@ docker_node: hostname: "{{ nodeid }}" role: manager - check_mode: yes + check_mode: true register: set_as_manager_1 - name: Try to set node as manager @@ -75,7 +75,7 @@ docker_node: hostname: "{{ nodeid }}" role: manager - check_mode: yes + check_mode: true register: set_as_manager_4 - name: assert that node role does has not changed @@ -98,14 +98,14 @@ docker_node: hostname: "{{ nodeid }}" role: worker - check_mode: yes + check_mode: true register: set_as_worker_1 - name: Try to set node as worker docker_node: hostname: "{{ nodeid }}" role: worker - ignore_errors: yes + ignore_errors: true register: set_as_worker_2 - name: assert that node cannot change role to worker @@ -123,7 +123,7 @@ docker_node: hostname: "{{ nodeid }}" availability: pause - check_mode: yes + check_mode: true register: set_as_paused_1 - name: Try to set node availability as paused @@ -142,7 +142,7 @@ docker_node: hostname: "{{ nodeid }}" availability: pause - check_mode: yes + check_mode: true register: set_as_paused_4 - name: assert node changed availability to paused @@ -162,7 +162,7 @@ docker_node: hostname: "{{ nodeid }}" availability: drain - check_mode: yes + check_mode: true register: output_drain_1 - name: Try to set node availability as drained @@ -181,7 +181,7 @@ docker_node: hostname: "{{ nodeid }}" availability: drain - check_mode: yes + check_mode: true register: output_drain_4 - name: assert node changed availability to drained @@ -202,7 +202,7 @@ docker_node: hostname: "{{ nodeid }}" availability: active - check_mode: yes + check_mode: true register: output_active_1 - name: Try to set node availability as active @@ -221,7 +221,7 @@ docker_node: hostname: "{{ nodeid }}" availability: active - check_mode: yes + check_mode: true register: output_active_4 - name: assert node changed availability to active @@ -242,7 +242,7 @@ hostname: "{{ nodeid }}" labels: label1: value1 - check_mode: yes + check_mode: true register: output_add_single_label_1 - name: Try to add single label to swarm node @@ -264,7 +264,7 @@ hostname: "{{ nodeid }}" labels: label1: value1 - check_mode: yes + check_mode: true register: output_add_single_label_4 - name: assert adding single label to swarm node @@ -290,7 +290,7 @@ label4: value4 label5: value5 label6: value6 - check_mode: yes + check_mode: true register: output_add_multiple_labels_1 - name: Try to add five labels to swarm node @@ -324,7 +324,7 @@ label4: value4 label5: value5 label6: value6 - check_mode: yes + check_mode: true register: output_add_multiple_labels_4 - name: assert adding multiple labels to swarm node @@ -347,7 +347,7 @@ hostname: "{{ nodeid }}" labels: label1: value1111 - check_mode: yes + check_mode: true register: output_update_label_1 - name: Update value of existing label @@ -369,7 +369,7 @@ hostname: "{{ nodeid }}" labels: label1: value1111 - check_mode: yes + check_mode: true register: output_update_label_4 - name: assert updating single label assigned to swarm node @@ -393,7 +393,7 @@ labels: label2: value2222 label3: value3333 - check_mode: yes + check_mode: true register: output_update_labels_1 - name: Update value of multiple existing label @@ -418,7 +418,7 @@ labels: label2: value2222 label3: value3333 - check_mode: yes + check_mode: true register: output_update_labels_4 - name: assert updating multiple labels assigned to swarm node @@ -442,7 +442,7 @@ hostname: "{{ nodeid }}" labels_to_remove: - label1 - check_mode: yes + check_mode: true register: output_remove_label_1 - name: Try to remove single existing label from swarm node @@ -464,7 +464,7 @@ hostname: "{{ nodeid }}" labels_to_remove: - label1 - check_mode: yes + check_mode: true register: output_remove_label_4 - name: assert removing single label from swarm node @@ -489,7 +489,7 @@ hostname: "{{ nodeid }}" labels_to_remove: - labelnotexist - check_mode: yes + check_mode: true register: output_remove_nonexist_label_1 - name: Try to remove single non-existing label from swarm node @@ -511,7 +511,7 @@ hostname: "{{ nodeid }}" labels_to_remove: - labelnotexist - check_mode: yes + check_mode: true register: output_remove_nonexist_label_4 - name: assert removing single non-existing label from swarm node @@ -536,7 +536,7 @@ labels_to_remove: - label2 - label3 - check_mode: yes + check_mode: true register: output_remove_label_1 - name: Try to remove two existing labels from swarm node @@ -561,7 +561,7 @@ labels_to_remove: - label2 - label3 - check_mode: yes + check_mode: true register: output_remove_label_4 - name: assert removing multiple labels from swarm node @@ -586,7 +586,7 @@ labels_to_remove: - label4 - labelisnotthere - check_mode: yes + check_mode: true register: output_remove_mix_labels_1 - name: Try to remove mix of existing amd non-existing labels from swarm node @@ -611,7 +611,7 @@ labels_to_remove: - label4 - labelisnotthere - check_mode: yes + check_mode: true register: output_remove_mix_labels_4 - name: assert removing mix of existing and non-existing labels from swarm node @@ -638,7 +638,7 @@ label8: value8 labels_to_remove: - label5 - check_mode: yes + check_mode: true register: output_add_del_labels_1 - name: Try to add and remove nonoverlapping labels at the same time @@ -669,7 +669,7 @@ label8: value8 labels_to_remove: - label5 - check_mode: yes + check_mode: true register: output_add_del_labels_4 - name: assert adding and removing nonoverlapping labels from swarm node @@ -696,7 +696,7 @@ labels_to_remove: - label6 - label7 - check_mode: yes + check_mode: true register: output_add_del_overlap_lables_1 - name: Try to add or update and remove overlapping labels at the same time @@ -730,7 +730,7 @@ labels_to_remove: - label6 - label7 - check_mode: yes + check_mode: true register: output_add_del_overlap_lables_4 - name: assert adding or updating and removing overlapping labels from swarm node @@ -756,7 +756,7 @@ label11: value11 label12: value12 labels_state: replace - check_mode: yes + check_mode: true register: output_replace_labels_1 - name: Replace labels on swarm node @@ -784,7 +784,7 @@ label11: value11 label12: value12 labels_state: replace - check_mode: yes + check_mode: true register: output_replace_labels_4 - name: assert replacing labels from swarm node @@ -806,7 +806,7 @@ docker_node: hostname: "{{ nodeid }}" labels_state: replace - check_mode: yes + check_mode: true register: output_remove_labels_1 - name: Remove all labels from swarm node @@ -825,7 +825,7 @@ docker_node: hostname: "{{ nodeid }}" labels_state: replace - check_mode: yes + check_mode: true register: output_remove_labels_4 - name: assert removing all lables from swarm node diff --git a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml index d6f78d56..9a89a2a1 100644 --- a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml +++ b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml @@ -11,7 +11,7 @@ - name: Try to get docker_node_info when docker is not running in swarm mode docker_node_info: - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called when swarm is not in use or not run on manager node @@ -46,7 +46,7 @@ - name: Try to get docker_node_info using the self parameter docker_node_info: - self: yes + self: true register: output - name: assert reading swarm facts with list of nodes option diff --git a/tests/integration/targets/docker_prune/tasks/main.yml b/tests/integration/targets/docker_prune/tasks/main.yml index f20d94e0..5026b9b5 100644 --- a/tests/integration/targets/docker_prune/tasks/main.yml +++ b/tests/integration/targets/docker_prune/tasks/main.yml @@ -41,11 +41,11 @@ # Prune objects - docker_prune: - containers: yes - images: yes - networks: yes - volumes: yes - builder_cache: yes + containers: true + images: true + networks: true + volumes: true + builder_cache: true register: result # Analyze result @@ -84,7 +84,7 @@ # Test with filters - name: Prune with filters docker_prune: - images: yes + images: true images_filters: dangling: true register: result @@ -98,7 +98,7 @@ block: - name: Prune with filters docker_prune: - volumes: yes + volumes: true volumes_filters: all: true register: result diff --git a/tests/integration/targets/docker_secret/tasks/test_secrets.yml b/tests/integration/targets/docker_secret/tasks/test_secrets.yml index 926aaec3..2615b640 100644 --- a/tests/integration/targets/docker_secret/tasks/test_secrets.yml +++ b/tests/integration/targets/docker_secret/tasks/test_secrets.yml @@ -17,7 +17,7 @@ - name: Parameter name should be required docker_secret: state: present - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called with no name @@ -30,7 +30,7 @@ docker_secret: name: foo state: present - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called with no data @@ -53,7 +53,7 @@ - name: Inspect secret command: "docker secret inspect {{ secret_id }}" register: inspect - ignore_errors: yes + ignore_errors: true - debug: var=inspect @@ -132,7 +132,7 @@ - name: Check that secret is removed command: "docker secret inspect {{ secret_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: assert secret was removed assert: @@ -156,7 +156,7 @@ - name: Inspect secret command: "docker secret inspect {{ secret_id }}" register: inspect - ignore_errors: yes + ignore_errors: true - debug: var=inspect @@ -198,7 +198,7 @@ - name: Check that secret is removed command: "docker secret inspect {{ original_output.secret_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: assert secret was removed assert: @@ -208,7 +208,7 @@ - name: Check that secret is removed command: "docker secret inspect {{ new_output.secret_id }}" register: output - ignore_errors: yes + ignore_errors: true - name: assert secret was removed assert: diff --git a/tests/integration/targets/docker_stack/tasks/test_stack.yml b/tests/integration/targets/docker_stack/tasks/test_stack.yml index c5d1838b..9f2d170e 100644 --- a/tests/integration/targets/docker_stack/tasks/test_stack.yml +++ b/tests/integration/targets/docker_stack/tasks/test_stack.yml @@ -22,7 +22,7 @@ register: output docker_stack: state: present - ignore_errors: yes + ignore_errors: true - name: assert failure when name not set assert: @@ -34,7 +34,7 @@ register: output docker_stack: name: test_stack - ignore_errors: yes + ignore_errors: true - name: assert failure when compose not set assert: diff --git a/tests/integration/targets/docker_swarm/tasks/cleanup.yml b/tests/integration/targets/docker_swarm/tasks/cleanup.yml index c49de861..944e795c 100644 --- a/tests/integration/targets/docker_swarm/tasks/cleanup.yml +++ b/tests/integration/targets/docker_swarm/tasks/cleanup.yml @@ -7,7 +7,7 @@ docker_swarm: state: absent force: true - ignore_errors: yes + ignore_errors: true register: leave_swarm - name: CLEANUP | Kill Docker and cleanup @@ -15,7 +15,7 @@ block: - name: CLEANUP | Kill docker daemon command: systemctl kill -s 9 docker - become: yes + become: true - name: CLEANUP | Clear out /var/lib/docker shell: rm -rf /var/lib/docker/* @@ -24,7 +24,7 @@ service: name: docker state: started - become: yes + become: true - name: CLEANUP | Wait for docker daemon to be fully started command: docker ps diff --git a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml index 275ff16b..79d524e5 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml @@ -12,7 +12,7 @@ - name: Test parameters with state=join docker_swarm: state: join - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called with state=join and no remote_addrs,join_token @@ -24,7 +24,7 @@ - name: Test parameters with state=remove docker_swarm: state: remove - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called with state=remove and no node_id @@ -41,47 +41,47 @@ docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: Create a Swarm cluster docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - diff: yes + diff: true register: output_2 - name: Create a Swarm cluster (idempotent) docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - diff: yes + diff: true register: output_3 - name: Create a Swarm cluster (idempotent, check mode) docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: Create a Swarm cluster (force re-create) docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - force: yes - diff: yes + force: true + diff: true register: output_5 - name: Create a Swarm cluster (force re-create, check mode) docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - force: yes - check_mode: yes - diff: yes + force: true + check_mode: true + diff: true register: output_6 - name: assert changed when create a new swarm cluster @@ -117,30 +117,30 @@ docker_swarm: state: absent force: true - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: Remove a Swarm cluster docker_swarm: state: absent force: true - diff: yes + diff: true register: output_2 - name: Remove a Swarm cluster (idempotent) docker_swarm: state: absent force: true - diff: yes + diff: true register: output_3 - name: Remove a Swarm cluster (idempotent, check mode) docker_swarm: state: absent force: true - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: assert changed when remove a swarm cluster diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options.yml b/tests/integration/targets/docker_swarm/tasks/tests/options.yml index 6ff4ceac..f88aa3f4 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options.yml @@ -11,7 +11,7 @@ state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" name: default - diff: yes + diff: true #################################################################### ## autolock_managers ############################################### @@ -20,63 +20,63 @@ - name: autolock_managers (check mode) docker_swarm: state: present - autolock_managers: yes - check_mode: yes - diff: yes + autolock_managers: true + check_mode: true + diff: true register: output_1 - ignore_errors: yes + ignore_errors: true - name: autolock_managers docker_swarm: state: present - autolock_managers: yes - diff: yes + autolock_managers: true + diff: true register: output_2 - ignore_errors: yes + ignore_errors: true - name: autolock_managers (idempotent) docker_swarm: state: present - autolock_managers: yes - diff: yes + autolock_managers: true + diff: true register: output_3 - ignore_errors: yes + ignore_errors: true - name: autolock_managers (idempotent, check mode) docker_swarm: state: present - autolock_managers: yes - check_mode: yes - diff: yes + autolock_managers: true + check_mode: true + diff: true register: output_4 - ignore_errors: yes + ignore_errors: true - name: autolock_managers (change, check mode) docker_swarm: state: present - autolock_managers: no - check_mode: yes - diff: yes + autolock_managers: false + check_mode: true + diff: true register: output_5 - ignore_errors: yes + ignore_errors: true - name: autolock_managers (change) docker_swarm: state: present - autolock_managers: no - diff: yes + autolock_managers: false + diff: true register: output_6 - ignore_errors: yes + ignore_errors: true - name: autolock_managers (force new swarm) docker_swarm: state: present - force: yes + force: true advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" - autolock_managers: yes - diff: yes + autolock_managers: true + diff: true register: output_7 - ignore_errors: yes + ignore_errors: true - name: assert autolock_managers changes assert: @@ -131,52 +131,52 @@ docker_swarm: state: present ca_force_rotate: 1 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - ignore_errors: yes + ignore_errors: true - name: ca_force_rotate docker_swarm: state: present ca_force_rotate: 1 - diff: yes + diff: true register: output_2 - ignore_errors: yes + ignore_errors: true - name: ca_force_rotate (idempotent) docker_swarm: state: present ca_force_rotate: 1 - diff: yes + diff: true register: output_3 - ignore_errors: yes + ignore_errors: true - name: ca_force_rotate (idempotent, check mode) docker_swarm: state: present ca_force_rotate: 1 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - ignore_errors: yes + ignore_errors: true - name: ca_force_rotate (change, check mode) docker_swarm: state: present ca_force_rotate: 0 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - ignore_errors: yes + ignore_errors: true - name: ca_force_rotate (change) docker_swarm: state: present ca_force_rotate: 0 - diff: yes + diff: true register: output_6 - ignore_errors: yes + ignore_errors: true - name: assert ca_force_rotate changes assert: @@ -221,45 +221,45 @@ docker_swarm: state: present dispatcher_heartbeat_period: 10 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: dispatcher_heartbeat_period docker_swarm: state: present dispatcher_heartbeat_period: 10 - diff: yes + diff: true register: output_2 - name: dispatcher_heartbeat_period (idempotent) docker_swarm: state: present dispatcher_heartbeat_period: 10 - diff: yes + diff: true register: output_3 - name: dispatcher_heartbeat_period (idempotent, check mode) docker_swarm: state: present dispatcher_heartbeat_period: 10 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: dispatcher_heartbeat_period (change, check mode) docker_swarm: state: present dispatcher_heartbeat_period: 23 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: dispatcher_heartbeat_period (change) docker_swarm: state: present dispatcher_heartbeat_period: 23 - diff: yes + diff: true register: output_6 - name: assert dispatcher_heartbeat_period changes @@ -298,45 +298,45 @@ docker_swarm: state: present election_tick: 20 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: election_tick docker_swarm: state: present election_tick: 20 - diff: yes + diff: true register: output_2 - name: election_tick (idempotent) docker_swarm: state: present election_tick: 20 - diff: yes + diff: true register: output_3 - name: election_tick (idempotent, check mode) docker_swarm: state: present election_tick: 20 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: election_tick (change, check mode) docker_swarm: state: present election_tick: 5 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: election_tick (change) docker_swarm: state: present election_tick: 5 - diff: yes + diff: true register: output_6 - name: assert election_tick changes @@ -375,45 +375,45 @@ docker_swarm: state: present heartbeat_tick: 2 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: heartbeat_tick docker_swarm: state: present heartbeat_tick: 2 - diff: yes + diff: true register: output_2 - name: heartbeat_tick (idempotent) docker_swarm: state: present heartbeat_tick: 2 - diff: yes + diff: true register: output_3 - name: heartbeat_tick (idempotent, check mode) docker_swarm: state: present heartbeat_tick: 2 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: heartbeat_tick (change, check mode) docker_swarm: state: present heartbeat_tick: 3 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: heartbeat_tick (change) docker_swarm: state: present heartbeat_tick: 3 - diff: yes + diff: true register: output_6 - name: assert heartbeat_tick changes @@ -451,45 +451,45 @@ docker_swarm: state: present keep_old_snapshots: 1 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: keep_old_snapshots docker_swarm: state: present keep_old_snapshots: 1 - diff: yes + diff: true register: output_2 - name: keep_old_snapshots (idempotent) docker_swarm: state: present keep_old_snapshots: 1 - diff: yes + diff: true register: output_3 - name: keep_old_snapshots (idempotent, check mode) docker_swarm: state: present keep_old_snapshots: 1 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: keep_old_snapshots (change, check mode) docker_swarm: state: present keep_old_snapshots: 2 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: keep_old_snapshots (change) docker_swarm: state: present keep_old_snapshots: 2 - diff: yes + diff: true register: output_6 - name: assert keep_old_snapshots changes @@ -529,10 +529,10 @@ labels: a: v1 b: v2 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - ignore_errors: yes + ignore_errors: true - name: labels docker_swarm: @@ -540,9 +540,9 @@ labels: a: v1 b: v2 - diff: yes + diff: true register: output_2 - ignore_errors: yes + ignore_errors: true - name: labels (idempotent) docker_swarm: @@ -550,9 +550,9 @@ labels: a: v1 b: v2 - diff: yes + diff: true register: output_3 - ignore_errors: yes + ignore_errors: true - name: labels (idempotent, check mode) docker_swarm: @@ -560,10 +560,10 @@ labels: a: v1 b: v2 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - ignore_errors: yes + ignore_errors: true - name: labels (change, check mode) docker_swarm: @@ -571,10 +571,10 @@ labels: a: v1 c: v3 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - ignore_errors: yes + ignore_errors: true - name: labels (change) docker_swarm: @@ -582,24 +582,24 @@ labels: a: v1 c: v3 - diff: yes + diff: true register: output_6 - ignore_errors: yes + ignore_errors: true - name: labels (not specifying, check mode) docker_swarm: state: present - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_7 - ignore_errors: yes + ignore_errors: true - name: labels (not specifying) docker_swarm: state: present - diff: yes + diff: true register: output_8 - ignore_errors: yes + ignore_errors: true - name: labels (idempotency, check that labels are still there) docker_swarm: @@ -607,43 +607,43 @@ labels: a: v1 c: v3 - diff: yes + diff: true register: output_9 - ignore_errors: yes + ignore_errors: true - name: labels (empty, check mode) docker_swarm: state: present labels: {} - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_10 - ignore_errors: yes + ignore_errors: true - name: labels (empty) docker_swarm: state: present labels: {} - diff: yes + diff: true register: output_11 - ignore_errors: yes + ignore_errors: true - name: labels (empty, idempotent, check mode) docker_swarm: state: present labels: {} - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_12 - ignore_errors: yes + ignore_errors: true - name: labels (empty, idempotent) docker_swarm: state: present labels: {} - diff: yes + diff: true register: output_13 - ignore_errors: yes + ignore_errors: true - name: assert labels changes assert: @@ -715,45 +715,45 @@ docker_swarm: state: present log_entries_for_slow_followers: 42 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: log_entries_for_slow_followers docker_swarm: state: present log_entries_for_slow_followers: 42 - diff: yes + diff: true register: output_2 - name: log_entries_for_slow_followers (idempotent) docker_swarm: state: present log_entries_for_slow_followers: 42 - diff: yes + diff: true register: output_3 - name: log_entries_for_slow_followers (idempotent, check mode) docker_swarm: state: present log_entries_for_slow_followers: 42 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: log_entries_for_slow_followers (change, check mode) docker_swarm: state: present log_entries_for_slow_followers: 23 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: log_entries_for_slow_followers (change) docker_swarm: state: present log_entries_for_slow_followers: 23 - diff: yes + diff: true register: output_6 - name: assert log_entries_for_slow_followers changes @@ -791,15 +791,15 @@ docker_swarm: state: present name: default - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: name (idempotent) docker_swarm: state: present name: default - diff: yes + diff: true register: output_2 # The name 'default' is hardcoded in docker swarm. Trying to change @@ -809,9 +809,9 @@ docker_swarm: state: present name: foobar - diff: yes + diff: true register: output_3 - ignore_errors: yes + ignore_errors: true - name: assert name changes assert: @@ -833,45 +833,45 @@ docker_swarm: state: present node_cert_expiry: 7896000000000000 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: node_cert_expiry docker_swarm: state: present node_cert_expiry: 7896000000000000 - diff: yes + diff: true register: output_2 - name: node_cert_expiry (idempotent) docker_swarm: state: present node_cert_expiry: 7896000000000000 - diff: yes + diff: true register: output_3 - name: node_cert_expiry (idempotent, check mode) docker_swarm: state: present node_cert_expiry: 7896000000000000 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: node_cert_expiry (change, check mode) docker_swarm: state: present node_cert_expiry: 8766000000000000 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: node_cert_expiry (change) docker_swarm: state: present node_cert_expiry: 8766000000000000 - diff: yes + diff: true register: output_6 - name: assert node_cert_expiry changes @@ -908,31 +908,31 @@ - name: rotate_manager_token (true, check mode) docker_swarm: state: present - rotate_manager_token: yes - check_mode: yes - diff: yes + rotate_manager_token: true + check_mode: true + diff: true register: output_1 - name: rotate_manager_token (true) docker_swarm: state: present - rotate_manager_token: yes - diff: yes + rotate_manager_token: true + diff: true register: output_2 - name: rotate_manager_token (false, idempotent) docker_swarm: state: present - rotate_manager_token: no - diff: yes + rotate_manager_token: false + diff: true register: output_3 - name: rotate_manager_token (false, check mode) docker_swarm: state: present - rotate_manager_token: no - check_mode: yes - diff: yes + rotate_manager_token: false + check_mode: true + diff: true register: output_4 - name: assert rotate_manager_token changes @@ -961,31 +961,31 @@ - name: rotate_worker_token (true, check mode) docker_swarm: state: present - rotate_worker_token: yes - check_mode: yes - diff: yes + rotate_worker_token: true + check_mode: true + diff: true register: output_1 - name: rotate_worker_token (true) docker_swarm: state: present - rotate_worker_token: yes - diff: yes + rotate_worker_token: true + diff: true register: output_2 - name: rotate_worker_token (false, idempotent) docker_swarm: state: present - rotate_worker_token: no - diff: yes + rotate_worker_token: false + diff: true register: output_3 - name: rotate_worker_token (false, check mode) docker_swarm: state: present - rotate_worker_token: no - check_mode: yes - diff: yes + rotate_worker_token: false + check_mode: true + diff: true register: output_4 - name: assert rotate_worker_token changes @@ -1015,45 +1015,45 @@ docker_swarm: state: present snapshot_interval: 12345 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: snapshot_interval docker_swarm: state: present snapshot_interval: 12345 - diff: yes + diff: true register: output_2 - name: snapshot_interval (idempotent) docker_swarm: state: present snapshot_interval: 12345 - diff: yes + diff: true register: output_3 - name: snapshot_interval (idempotent, check mode) docker_swarm: state: present snapshot_interval: 12345 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: snapshot_interval (change, check mode) docker_swarm: state: present snapshot_interval: 54321 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: snapshot_interval (change) docker_swarm: state: present snapshot_interval: 54321 - diff: yes + diff: true register: output_6 - name: assert snapshot_interval changes @@ -1091,45 +1091,45 @@ docker_swarm: state: present task_history_retention_limit: 23 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_1 - name: task_history_retention_limit docker_swarm: state: present task_history_retention_limit: 23 - diff: yes + diff: true register: output_2 - name: task_history_retention_limit (idempotent) docker_swarm: state: present task_history_retention_limit: 23 - diff: yes + diff: true register: output_3 - name: task_history_retention_limit (idempotent, check mode) docker_swarm: state: present task_history_retention_limit: 23 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_4 - name: task_history_retention_limit (change, check mode) docker_swarm: state: present task_history_retention_limit: 7 - check_mode: yes - diff: yes + check_mode: true + diff: true register: output_5 - name: task_history_retention_limit (change) docker_swarm: state: present task_history_retention_limit: 7 - diff: yes + diff: true register: output_6 - name: assert task_history_retention_limit changes diff --git a/tests/integration/targets/docker_swarm/tasks/tests/remote-addr-pool.yml b/tests/integration/targets/docker_swarm/tasks/tests/remote-addr-pool.yml index 8e229f5a..66f422e5 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/remote-addr-pool.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/remote-addr-pool.yml @@ -15,18 +15,18 @@ state: present default_addr_pool: - "2.0.0.0/16" - diff: yes + diff: true register: output_1 - ignore_errors: yes + ignore_errors: true - name: default_addr_pool (idempotent) docker_swarm: state: present default_addr_pool: - "2.0.0.0/16" - diff: yes + diff: true register: output_2 - ignore_errors: yes + ignore_errors: true - name: assert default_addr_pool assert: @@ -52,27 +52,27 @@ - name: Leave swarm docker_swarm: state: absent - force: yes + force: true default_addr_pool: - "2.0.0.0/16" - diff: yes + diff: true - name: subnet_size docker_swarm: state: present - force: yes + force: true subnet_size: 26 - diff: yes + diff: true register: output_1 - ignore_errors: yes + ignore_errors: true - name: subnet_size (idempotent) docker_swarm: state: present subnet_size: 26 - diff: yes + diff: true register: output_2 - ignore_errors: yes + ignore_errors: true - name: assert subnet_size assert: diff --git a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml index a521a689..288e2a0b 100644 --- a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml +++ b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml @@ -11,7 +11,7 @@ - name: Try to get docker_swarm_info when docker is not running in swarm mode docker_swarm_info: - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called when swarm is not in use or not run on mamager node @@ -55,7 +55,7 @@ - name: Try to get docker_swarm_info and list of nodes when docker is running in swarm mode and as manager docker_swarm_info: - nodes: yes + nodes: true register: output - name: assert reding swarm facts with list of nodes option @@ -77,8 +77,8 @@ - name: Try to get docker_swarm_info and verbose list of nodes when docker is running in swarm mode and as manager docker_swarm_info: - nodes: yes - verbose_output: yes + nodes: true + verbose_output: true register: output - name: assert reading swarm facts with list of nodes and versbose output options @@ -96,7 +96,7 @@ - name: Try to get docker_swarm_info and list of nodes with filters providing existing node name docker_swarm_info: - nodes: yes + nodes: true nodes_filters: name: "{{ localnodename }}" register: output @@ -119,7 +119,7 @@ - name: Try to get docker_swarm_info and list of nodes with filters providing non-existing random node name docker_swarm_info: - nodes: yes + nodes: true nodes_filters: name: "{{ randomnodename }}" register: output @@ -138,9 +138,9 @@ - name: Try to get docker_swarm_info and swarm_unlock_key on non a unlocked swarm docker_swarm_info: - unlock_key: yes + unlock_key: true register: output - ignore_errors: yes + ignore_errors: true - name: assert reading swarm facts and non existing swarm unlock key assert: @@ -163,13 +163,13 @@ advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" autolock_managers: true register: autolock_managers_update_output - ignore_errors: yes + ignore_errors: true - name: Try to get docker_swarm_info and swarm_unlock_key docker_swarm_info: - unlock_key: yes + unlock_key: true register: output - ignore_errors: yes + ignore_errors: true - name: assert reading swarm facts and swarm unlock key assert: diff --git a/tests/integration/targets/docker_swarm_service/tasks/main.yml b/tests/integration/targets/docker_swarm_service/tasks/main.yml index ffc04719..5a5795b5 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/main.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/main.yml @@ -39,44 +39,44 @@ name: "{{ item }}" state: absent loop: "{{ service_names }}" - ignore_errors: yes + ignore_errors: true - name: Make sure all networks are removed docker_network: name: "{{ item }}" state: absent - force: yes + force: true loop: "{{ network_names }}" - ignore_errors: yes + ignore_errors: true - name: Make sure all configs are removed docker_config: name: "{{ item }}" state: absent - force: yes + force: true loop: "{{ config_names }}" - ignore_errors: yes + ignore_errors: true - name: Make sure all volumes are removed docker_volume: name: "{{ item }}" state: absent loop: "{{ volume_names }}" - ignore_errors: yes + ignore_errors: true - name: Make sure all secrets are removed docker_secret: name: "{{ item }}" state: absent - force: yes + force: true loop: "{{ secret_names }}" - ignore_errors: yes + ignore_errors: true - name: Make sure swarm is removed docker_swarm: state: absent - force: yes - ignore_errors: yes + force: true + ignore_errors: true when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=') - fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!" diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml index f1008869..9f2fa8c3 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml @@ -44,32 +44,32 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" register: configs_1 - ignore_errors: yes + ignore_errors: true - name: configs (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" register: configs_2 - ignore_errors: yes + ignore_errors: true - name: configs (add) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" @@ -78,13 +78,13 @@ - config_name: "{{ config_name_2 }}" filename: "/tmp/{{ config_name_2 }}.txt" register: configs_3 - ignore_errors: yes + ignore_errors: true - name: configs (add idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_1 }}" @@ -93,13 +93,13 @@ config_name: "{{ config_name_2 }}" filename: "/tmp/{{ config_name_2 }}.txt" register: configs_4 - ignore_errors: yes + ignore_errors: true - name: configs (add idempotency no id) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_1 }}" @@ -107,13 +107,13 @@ - config_name: "{{ config_name_2 }}" filename: "/tmp/{{ config_name_2 }}.txt" register: configs_5 - ignore_errors: yes + ignore_errors: true - name: configs (add idempotency no id and re-ordered) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_2 }}" @@ -121,39 +121,39 @@ - config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" register: configs_6 - ignore_errors: yes + ignore_errors: true - name: configs (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: [] register: configs_7 - ignore_errors: yes + ignore_errors: true - name: configs (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: [] register: configs_8 - ignore_errors: yes + ignore_errors: true - name: rolling configs docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_3 }}_v1" filename: "/run/configs/{{ config_name_3 }}.txt" register: configs_9 - ignore_errors: yes + ignore_errors: true - name: update rolling config docker_config: @@ -163,25 +163,25 @@ rolling_versions: true register: configs_10 when: docker_api_version is version('1.30', '>=') and docker_py_version is version('2.6.0', '>=') - ignore_errors: yes + ignore_errors: true - name: rolling configs service update docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_name: "{{ config_name_3 }}_v2" filename: "/run/configs/{{ config_name_3 }}.txt" register: configs_11 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -212,72 +212,72 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" uid: 1000 register: configs_1 - ignore_errors: yes + ignore_errors: true - name: configs (uid int idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" uid: 1000 register: configs_2 - ignore_errors: yes + ignore_errors: true - name: configs (uid int change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" uid: 1002 register: configs_3 - ignore_errors: yes + ignore_errors: true - name: configs (uid str) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" uid: "1001" register: configs_4 - ignore_errors: yes + ignore_errors: true - name: configs (uid str idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" uid: "1001" register: configs_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: - configs_1 is changed @@ -302,72 +302,72 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" gid: 1000 register: configs_1 - ignore_errors: yes + ignore_errors: true - name: configs (gid int idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" gid: 1000 register: configs_2 - ignore_errors: yes + ignore_errors: true - name: configs (gid int change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" gid: 1002 register: configs_3 - ignore_errors: yes + ignore_errors: true - name: configs (gid str) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" gid: "1001" register: configs_4 - ignore_errors: yes + ignore_errors: true - name: configs (gid str idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" gid: "1001" register: configs_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: - configs_1 is changed @@ -391,46 +391,46 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" mode: 0600 register: configs_1 - ignore_errors: yes + ignore_errors: true - name: configs (mode idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" mode: 0600 register: configs_2 - ignore_errors: yes + ignore_errors: true - name: configs (mode change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - config_id: "{{ config_result_1.config_id|default('') }}" config_name: "{{ config_name_1 }}" mode: 0777 register: configs_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: - configs_1 is changed @@ -452,12 +452,12 @@ docker_config: name: "{{ config_name }}" state: absent - force: yes + force: true loop: - "{{ config_name_1 }}" - "{{ config_name_2 }}" - "{{ config_name_3 }}" loop_control: loop_var: config_name - ignore_errors: yes + ignore_errors: true when: docker_api_version is version('1.30', '>=') and docker_py_version is version('2.6.0', '>=') diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/logging.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/logging.yml index 9408196c..22947fbd 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/logging.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/logging.yml @@ -19,7 +19,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -29,7 +29,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -39,7 +39,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: syslog @@ -49,7 +49,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -65,7 +65,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -78,7 +78,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -91,7 +91,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -105,7 +105,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -116,7 +116,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' logging: driver: json-file @@ -127,7 +127,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml index a2bf4d7c..a1e185e1 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml @@ -8,7 +8,7 @@ register: output docker_swarm_service: state: present - ignore_errors: yes + ignore_errors: true - name: assert failure when name not set assert: @@ -33,7 +33,7 @@ name: test_service endpoint_mode: dnsrr image: "{{ docker_test_image_busybox }}" - resolve_image: no + resolve_image: false args: - sleep - "3600" @@ -48,7 +48,7 @@ docker_swarm_service: name: test_service image: "{{ docker_test_image_busybox }}" - resolve_image: no + resolve_image: false args: - sleep - "1800" @@ -63,7 +63,7 @@ docker_swarm_service: name: test_service image: "{{ docker_test_image_busybox }}" - resolve_image: no + resolve_image: false endpoint_mode: vip mode: global args: @@ -80,7 +80,7 @@ docker_swarm_service: name: test_service image: "{{ docker_test_image_busybox }}" - resolve_image: no + resolve_image: false mode: global args: - sleep diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml index c90b77c4..7605d9fc 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml @@ -31,7 +31,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -43,7 +43,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -55,7 +55,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -70,7 +70,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "/tmp/" @@ -85,7 +85,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: [] register: mounts_5 @@ -94,7 +94,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: [] register: mounts_6 @@ -103,7 +103,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -122,7 +122,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -135,7 +135,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -147,7 +147,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -159,7 +159,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -175,7 +175,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "/tmp" @@ -189,7 +189,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "/tmp" @@ -202,7 +202,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "/tmp" @@ -215,7 +215,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -231,7 +231,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -247,7 +247,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -262,7 +262,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -276,7 +276,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -292,7 +292,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -306,7 +306,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -319,7 +319,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -332,7 +332,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -348,7 +348,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -364,7 +364,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -380,7 +380,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -394,7 +394,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -410,7 +410,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -418,13 +418,13 @@ type: "tmpfs" tmpfs_size: "50M" register: mounts_tmpfs_size_1 - ignore_errors: yes + ignore_errors: true - name: mounts.tmpfs_size (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -432,13 +432,13 @@ type: "tmpfs" tmpfs_size: "50M" register: mounts_tmpfs_size_2 - ignore_errors: yes + ignore_errors: true - name: mounts.tmpfs_size (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -446,13 +446,13 @@ type: "tmpfs" tmpfs_size: "25M" register: mounts_tmpfs_size_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -474,7 +474,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -482,13 +482,13 @@ type: "tmpfs" tmpfs_mode: 0444 register: mounts_tmpfs_mode_1 - ignore_errors: yes + ignore_errors: true - name: mounts.tmpfs_mode (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -496,13 +496,13 @@ type: "tmpfs" tmpfs_mode: 0444 register: mounts_tmpfs_mode_2 - ignore_errors: yes + ignore_errors: true - name: mounts.tmpfs_mode (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "{{ volume_name_1 }}" @@ -510,13 +510,13 @@ type: "tmpfs" tmpfs_mode: 0777 register: mounts_tmpfs_mode_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -538,45 +538,45 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "" target: "/tmp/{{ volume_name_1 }}" type: "tmpfs" register: mounts_tmpfs_source_1 - ignore_errors: yes + ignore_errors: true - name: mounts.source (empty for tmpfs idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - source: "" target: "/tmp/{{ volume_name_1 }}" type: "tmpfs" register: mounts_tmpfs_source_2 - ignore_errors: yes + ignore_errors: true - name: mounts.source (not specified for tmpfs idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mounts: - target: "/tmp/{{ volume_name_1 }}" type: "tmpfs" register: mounts_tmpfs_source_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -603,4 +603,4 @@ - "{{ volume_name_2 }}" loop_control: loop_var: volume_name - ignore_errors: yes + ignore_errors: true diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/networks.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/networks.yml index 8e596a33..f57824f9 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/networks.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/networks.yml @@ -32,7 +32,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_1 }}" @@ -42,7 +42,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_1 }}" @@ -52,7 +52,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -62,7 +62,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_1 }}" @@ -73,7 +73,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_1 }}" @@ -84,7 +84,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -95,7 +95,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -106,7 +106,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_2 }}" @@ -117,7 +117,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_2 }}" @@ -127,7 +127,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "{{ network_name_2 }}" @@ -137,7 +137,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: [] register: networks_11 @@ -146,7 +146,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: [] register: networks_12 @@ -155,40 +155,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - "idonotexist" register: networks_13 - ignore_errors: yes + ignore_errors: true - name: networks (missing dict key name) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - foo: "bar" register: networks_14 - ignore_errors: yes + ignore_errors: true - name: networks (invalid list type) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - [1, 2, 3] register: networks_15 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -231,7 +231,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -244,7 +244,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -257,7 +257,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -270,7 +270,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -282,7 +282,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -293,7 +293,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -304,20 +304,20 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" aliases: - [1, 2, 3] register: networks_aliases_7 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -338,7 +338,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -351,7 +351,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -364,7 +364,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -377,7 +377,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -389,19 +389,19 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" options: [1, 2, 3] register: networks_options_5 - ignore_errors: yes + ignore_errors: true - name: networks.options (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -412,7 +412,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' networks: - name: "{{ network_name_1 }}" @@ -423,7 +423,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -444,10 +444,10 @@ docker_network: name: "{{ network_name }}" state: absent - force: yes + force: true loop: - "{{ network_name_1 }}" - "{{ network_name_2 }}" loop_control: loop_var: network_name - ignore_errors: yes + ignore_errors: true diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml index fe7b87e1..4cc6a574 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml @@ -19,7 +19,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false args: - sleep - "3600" @@ -29,7 +29,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false args: - sleep - "3600" @@ -39,7 +39,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false args: - sleep - "3400" @@ -49,7 +49,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false args: [] register: args_4 @@ -57,7 +57,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false args: [] register: args_5 @@ -65,7 +65,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -83,7 +83,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' register: command_1 @@ -91,7 +91,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' register: command_2 @@ -99,7 +99,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -c "sleep 10m"' register: command_3 @@ -107,7 +107,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: - "/bin/sh" - "-c" @@ -118,7 +118,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: [] register: command_5 @@ -126,7 +126,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: [] register: command_6 @@ -134,27 +134,27 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no - command: yes + resolve_image: false + command: true register: command_7 - ignore_errors: yes + ignore_errors: true - name: command (list failure) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: - "/bin/sh" - yes register: command_8 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -175,7 +175,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' container_labels: test_1: "1" @@ -186,7 +186,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' container_labels: test_1: "1" @@ -197,7 +197,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' container_labels: test_1: "1" @@ -208,7 +208,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' container_labels: {} register: container_labels_4 @@ -217,7 +217,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' container_labels: {} register: container_labels_5 @@ -226,7 +226,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -244,75 +244,75 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: - 1.1.1.1 - 8.8.8.8 register: dns_1 - ignore_errors: yes + ignore_errors: true - name: dns (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: - 1.1.1.1 - 8.8.8.8 register: dns_2 - ignore_errors: yes + ignore_errors: true - name: dns_servers (changed order) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: - 8.8.8.8 - 1.1.1.1 register: dns_3 - ignore_errors: yes + ignore_errors: true - name: dns_servers (changed elements) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: - 8.8.8.8 - 9.9.9.9 register: dns_4 - ignore_errors: yes + ignore_errors: true - name: dns_servers (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: [] register: dns_5 - ignore_errors: yes + ignore_errors: true - name: dns_servers (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns: [] register: dns_6 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -337,75 +337,75 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: - "timeout:10" - rotate register: dns_options_1 - ignore_errors: yes + ignore_errors: true - name: dns_options (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: - "timeout:10" - rotate register: dns_options_2 - ignore_errors: yes + ignore_errors: true - name: dns_options (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: - "timeout:10" - no-check-names register: dns_options_3 - ignore_errors: yes + ignore_errors: true - name: dns_options (order idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: - no-check-names - "timeout:10" register: dns_options_4 - ignore_errors: yes + ignore_errors: true - name: dns_options (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: [] register: dns_options_5 - ignore_errors: yes + ignore_errors: true - name: dns_options (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_options: [] register: dns_options_6 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -430,75 +430,75 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: - example.com - example.org register: dns_search_1 - ignore_errors: yes + ignore_errors: true - name: dns_search (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: - example.com - example.org register: dns_search_2 - ignore_errors: yes + ignore_errors: true - name: dns_search (different order) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: - example.org - example.com register: dns_search_3 - ignore_errors: yes + ignore_errors: true - name: dns_search (changed elements) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: - ansible.com - example.com register: dns_search_4 - ignore_errors: yes + ignore_errors: true - name: dns_search (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: [] register: dns_search_5 - ignore_errors: yes + ignore_errors: true - name: dns_search (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' dns_search: [] register: dns_search_6 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -523,37 +523,37 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' endpoint_mode: "dnsrr" register: endpoint_mode_1 - ignore_errors: yes + ignore_errors: true - name: endpoint_mode (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' endpoint_mode: "dnsrr" register: endpoint_mode_2 - ignore_errors: yes + ignore_errors: true - name: endpoint_mode (changes) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' endpoint_mode: "vip" register: endpoint_mode_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -575,7 +575,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: - "TEST1=val1" @@ -586,7 +586,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: TEST1: val1 @@ -597,7 +597,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: - "TEST1=val1" @@ -608,7 +608,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: - "TEST2=val3" @@ -619,7 +619,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: [] register: env_5 @@ -628,7 +628,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' env: [] register: env_6 @@ -637,28 +637,28 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env: TEST1: true register: env_7 - ignore_errors: yes + ignore_errors: true - name: env (fail invalid formatted string) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env: - "TEST1=val3" - "TEST2" register: env_8 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -687,7 +687,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: - "{{ remote_tmp_dir }}/env-file-1" register: env_file_1 @@ -696,7 +696,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: - "{{ remote_tmp_dir }}/env-file-1" register: env_file_2 @@ -705,7 +705,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: - "{{ remote_tmp_dir }}/env-file-1" - "{{ remote_tmp_dir }}/env-file-2" @@ -715,7 +715,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: - "{{ remote_tmp_dir }}/env-file-2" - "{{ remote_tmp_dir }}/env-file-1" @@ -725,7 +725,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: - "{{ remote_tmp_dir }}/env-file-2" - "{{ remote_tmp_dir }}/env-file-1" @@ -735,7 +735,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: [] register: env_file_6 @@ -743,7 +743,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false env_files: [] register: env_file_7 @@ -751,7 +751,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -771,33 +771,33 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' args: - sleep - "3600" - force_update: yes + force_update: true register: force_update_1 - ignore_errors: yes + ignore_errors: true - name: force_update (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' args: - sleep - "3600" - force_update: yes + force_update: true register: force_update_2 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -818,74 +818,74 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: - "1234" - "5678" register: groups_1 - ignore_errors: yes + ignore_errors: true - name: groups (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: - "1234" - "5678" register: groups_2 - ignore_errors: yes + ignore_errors: true - name: groups (order idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: - "5678" - "1234" register: groups_3 - ignore_errors: yes + ignore_errors: true - name: groups (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: - "1234" register: groups_4 - ignore_errors: yes + ignore_errors: true - name: groups (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: [] register: groups_5 - ignore_errors: yes + ignore_errors: true - name: groups (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' groups: [] register: groups_6 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -910,7 +910,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: @@ -922,13 +922,13 @@ retries: 2 start_period: 20s register: healthcheck_1 - ignore_errors: yes + ignore_errors: true - name: healthcheck (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: @@ -940,13 +940,13 @@ retries: 2 start_period: 20s register: healthcheck_2 - ignore_errors: yes + ignore_errors: true - name: healthcheck (changed) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: @@ -957,79 +957,79 @@ interval: 0h1m2s3ms4us retries: 3 register: healthcheck_3 - ignore_errors: yes + ignore_errors: true - name: healthcheck (disabled) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: - NONE register: healthcheck_4 - ignore_errors: yes + ignore_errors: true - name: healthcheck (disabled, idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: - NONE register: healthcheck_5 - ignore_errors: yes + ignore_errors: true - name: healthcheck (string in healthcheck test, changed) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: "sleep 1" register: healthcheck_6 - ignore_errors: yes + ignore_errors: true - name: healthcheck (string in healthcheck test, idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: test: "sleep 1" register: healthcheck_7 - ignore_errors: yes + ignore_errors: true - name: healthcheck (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: {} register: healthcheck_8 - ignore_errors: yes + ignore_errors: true - name: healthcheck (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' healthcheck: {} register: healthcheck_9 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1057,37 +1057,37 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hostname: me.example.com register: hostname_1 - ignore_errors: yes + ignore_errors: true - name: hostname (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hostname: me.example.com register: hostname_2 - ignore_errors: yes + ignore_errors: true - name: hostname (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hostname: me.example.org register: hostname_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1109,42 +1109,42 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hosts: example.com: 1.2.3.4 example.org: 4.3.2.1 register: hosts_1 - ignore_errors: yes + ignore_errors: true - name: hosts (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hosts: example.com: 1.2.3.4 example.org: 4.3.2.1 register: hosts_2 - ignore_errors: yes + ignore_errors: true - name: hosts (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' hosts: example.com: 1.2.3.4 register: hosts_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1167,7 +1167,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' register: image_1 @@ -1175,7 +1175,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' register: image_2 @@ -1189,7 +1189,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1205,7 +1205,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' labels: test_1: "1" @@ -1216,7 +1216,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' labels: test_1: "1" @@ -1227,7 +1227,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' labels: test_1: "1" @@ -1239,7 +1239,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' labels: {} register: labels_4 @@ -1248,7 +1248,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' labels: {} register: labels_5 @@ -1257,7 +1257,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1275,7 +1275,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mode: "replicated" replicas: 1 @@ -1285,7 +1285,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mode: "replicated" replicas: 1 @@ -1295,7 +1295,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' mode: "global" replicas: 1 @@ -1305,7 +1305,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1321,7 +1321,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_grace_period: 60s register: stop_grace_period_1 @@ -1330,7 +1330,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_grace_period: 60s register: stop_grace_period_2 @@ -1339,7 +1339,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_grace_period: 1m30s register: stop_grace_period_3 @@ -1348,7 +1348,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1364,37 +1364,37 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_signal: "30" register: stop_signal_1 - ignore_errors: yes + ignore_errors: true - name: stop_signal (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_signal: "30" register: stop_signal_2 - ignore_errors: yes + ignore_errors: true - name: stop_signal (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' stop_signal: "9" register: stop_signal_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1416,7 +1416,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: tcp @@ -1426,13 +1426,13 @@ published_port: 60002 target_port: 60002 register: publish_1 - ignore_errors: yes + ignore_errors: true - name: publish (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: udp @@ -1441,13 +1441,13 @@ - published_port: 60001 target_port: 60001 register: publish_2 - ignore_errors: yes + ignore_errors: true - name: publish (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: tcp @@ -1457,13 +1457,13 @@ published_port: 60001 target_port: 60001 register: publish_3 - ignore_errors: yes + ignore_errors: true - name: publish (mode) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: tcp @@ -1475,13 +1475,13 @@ target_port: 60001 mode: host register: publish_4 - ignore_errors: yes + ignore_errors: true - name: publish (mode idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: udp @@ -1493,33 +1493,33 @@ target_port: 60003 mode: host register: publish_5 - ignore_errors: yes + ignore_errors: true - name: publish (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: [] register: publish_6 - ignore_errors: yes + ignore_errors: true - name: publish (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: [] register: publish_7 - ignore_errors: yes + ignore_errors: true - name: publish (publishes the same port with both protocols) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: udp @@ -1531,7 +1531,7 @@ target_port: 60001 mode: host register: publish_8 - ignore_errors: yes + ignore_errors: true - name: gather service info docker_swarm_service_info: name: "{{ service_name }}" @@ -1541,14 +1541,14 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: udp target_port: 60001 mode: host register: publish_9 - ignore_errors: yes + ignore_errors: true - name: gather service info docker_swarm_service_info: name: "{{ service_name }}" @@ -1558,14 +1558,14 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' publish: - protocol: udp target_port: 60001 mode: host register: publish_10 - ignore_errors: yes + ignore_errors: true - name: gather service info docker_swarm_service_info: name: "{{ service_name }}" @@ -1575,7 +1575,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1605,37 +1605,37 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' read_only: true register: read_only_1 - ignore_errors: yes + ignore_errors: true - name: read_only (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' read_only: true register: read_only_2 - ignore_errors: yes + ignore_errors: true - name: read_only (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' read_only: false register: read_only_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1657,7 +1657,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' replicas: 2 register: replicas_1 @@ -1666,7 +1666,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' replicas: 2 register: replicas_2 @@ -1675,7 +1675,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' replicas: 3 register: replicas_3 @@ -1684,7 +1684,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1719,13 +1719,13 @@ command: '/bin/sh -v -c "sleep 10m"' resolve_image: true register: resolve_image_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1750,37 +1750,37 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' - tty: yes + tty: true register: tty_1 - ignore_errors: yes + ignore_errors: true - name: tty (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' - tty: yes + tty: true register: tty_2 - ignore_errors: yes + ignore_errors: true - name: tty (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' - tty: no + tty: false register: tty_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1802,7 +1802,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' user: "operator" register: user_1 @@ -1811,7 +1811,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' user: "operator" register: user_2 @@ -1820,7 +1820,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' user: "root" register: user_3 @@ -1829,7 +1829,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1845,7 +1845,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false working_dir: /tmp register: working_dir_1 @@ -1853,7 +1853,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false working_dir: /tmp register: working_dir_2 @@ -1861,7 +1861,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false working_dir: / register: working_dir_3 @@ -1869,7 +1869,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1885,7 +1885,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true register: init_1 @@ -1893,7 +1893,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true register: init_2 @@ -1901,7 +1901,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: false register: init_3 @@ -1909,7 +1909,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -1932,61 +1932,61 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true cap_add: - sys_time cap_drop: - all register: capabilities_1 - ignore_errors: yes + ignore_errors: true - name: capabilities, cap_drop (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true cap_add: - sys_time cap_drop: - all register: capabilities_2 - ignore_errors: yes + ignore_errors: true diff: true - name: capabilities, cap_drop (less) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true cap_add: [] cap_drop: - all register: capabilities_3 - ignore_errors: yes + ignore_errors: true diff: true - name: capabilities, cap_drop (changed) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false init: true cap_add: - setgid cap_drop: - all register: capabilities_4 - ignore_errors: yes + ignore_errors: true diff: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/placement.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/placement.yml index 733ac3b9..30ed155b 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/placement.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/placement.yml @@ -20,65 +20,65 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: preferences: - spread: "node.labels.test" register: placement_preferences_1 - ignore_errors: yes + ignore_errors: true - name: placement.preferences (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: preferences: - spread: "node.labels.test" register: placement_preferences_2 - ignore_errors: yes + ignore_errors: true - name: placement.preferences (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: preferences: - spread: "node.labels.test2" register: placement_preferences_3 - ignore_errors: yes + ignore_errors: true - name: placement.preferences (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: preferences: [] register: placement_preferences_4 - ignore_errors: yes + ignore_errors: true - name: placement.preferences (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: preferences: [] register: placement_preferences_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -102,91 +102,91 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: - "node.role == manager" register: constraints_1 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: - "node.role == manager" register: constraints_2 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: - "node.role == worker" register: constraints_3 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (add) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: - "node.role == worker" - "node.label != non_existent_label" register: constraints_4 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (order idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: - "node.label != non_existent_label" - "node.role == worker" register: constraints_5 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: [] register: constraints_6 - ignore_errors: yes + ignore_errors: true - name: placement.constraints (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: constraints: [] register: constraints_7 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -212,41 +212,41 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: replicas_max_per_node: 1 register: replicas_max_per_node_1 - ignore_errors: yes + ignore_errors: true - name: placement.replicas_max_per_node (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: replicas_max_per_node: 1 register: replicas_max_per_node_2 - ignore_errors: yes + ignore_errors: true - name: placement.replicas_max_per_node (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' placement: replicas_max_per_node: 2 register: replicas_max_per_node_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/resources.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/resources.yml index a216a4eb..ac891750 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/resources.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/resources.yml @@ -19,7 +19,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: cpus: 1 @@ -29,7 +29,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: cpus: 1 @@ -39,7 +39,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: cpus: 0.5 @@ -49,7 +49,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -65,7 +65,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: memory: 64M @@ -75,7 +75,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: memory: 64M @@ -85,7 +85,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' limits: memory: 32M @@ -95,7 +95,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -111,7 +111,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: cpus: 1 @@ -121,7 +121,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: cpus: 1 @@ -131,7 +131,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: cpus: 0.5 @@ -141,7 +141,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -157,7 +157,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: memory: 64M @@ -167,7 +167,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: memory: 64M @@ -177,7 +177,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' reservations: memory: 32M @@ -187,7 +187,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/restart_config.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/restart_config.yml index 8c55999e..f80a4475 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/restart_config.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/restart_config.yml @@ -19,7 +19,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: condition: "on-failure" @@ -29,7 +29,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: condition: "on-failure" @@ -39,7 +39,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: condition: "any" @@ -49,7 +49,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -65,7 +65,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: max_attempts: 1 @@ -75,7 +75,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: max_attempts: 1 @@ -85,7 +85,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: max_attempts: 2 @@ -95,7 +95,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -111,7 +111,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: delay: 5s @@ -121,7 +121,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: delay: 5s @@ -131,7 +131,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: delay: 10s @@ -141,7 +141,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -157,7 +157,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: window: 10s @@ -167,7 +167,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: window: 10s @@ -177,7 +177,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' restart_config: window: 20s @@ -187,7 +187,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/rollback_config.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/rollback_config.yml index 7e6a85b5..9035ffdb 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/rollback_config.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/rollback_config.yml @@ -19,40 +19,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: delay: 5s register: rollback_config_delay_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.delay (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: delay: 5s register: rollback_config_delay_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.delay (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: delay: 12s register: rollback_config_delay_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -74,40 +74,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: failure_action: "pause" register: rollback_config_failure_action_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.failure_action (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: failure_action: "pause" register: rollback_config_failure_action_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.failure_action (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: failure_action: "continue" register: rollback_config_failure_action_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -129,40 +129,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: max_failure_ratio: 0.25 register: rollback_config_max_failure_ratio_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.max_failure_ratio (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: max_failure_ratio: 0.25 register: rollback_config_max_failure_ratio_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.max_failure_ratio (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: max_failure_ratio: 0.50 register: rollback_config_max_failure_ratio_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -184,40 +184,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: monitor: 10s register: rollback_config_monitor_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.monitor (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: monitor: 10s register: rollback_config_monitor_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.monitor (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: monitor: 60s register: rollback_config_monitor_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -239,40 +239,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: order: "start-first" register: rollback_config_order_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.order (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: order: "start-first" register: rollback_config_order_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.order (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: order: "stop-first" register: rollback_config_order_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -294,40 +294,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: parallelism: 2 register: rollback_config_parallelism_1 - ignore_errors: yes + ignore_errors: true - name: rollback_config.parallelism (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: parallelism: 2 register: rollback_config_parallelism_2 - ignore_errors: yes + ignore_errors: true - name: rollback_config.parallelism (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' rollback_config: parallelism: 1 register: rollback_config_parallelism_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml index a658d806..2af5076f 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml @@ -44,32 +44,32 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" register: secrets_1 - ignore_errors: yes + ignore_errors: true - name: secrets (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" register: secrets_2 - ignore_errors: yes + ignore_errors: true - name: secrets (add) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" @@ -78,13 +78,13 @@ - secret_name: "{{ secret_name_2 }}" filename: "/run/secrets/{{ secret_name_2 }}.txt" register: secrets_3 - ignore_errors: yes + ignore_errors: true - name: secrets (add idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_1 }}" @@ -93,13 +93,13 @@ secret_name: "{{ secret_name_2 }}" filename: "/run/secrets/{{ secret_name_2 }}.txt" register: secrets_4 - ignore_errors: yes + ignore_errors: true - name: secrets (add idempotency no id) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_1 }}" @@ -107,13 +107,13 @@ - secret_name: "{{ secret_name_2 }}" filename: "/run/secrets/{{ secret_name_2 }}.txt" register: secrets_5 - ignore_errors: yes + ignore_errors: true - name: secrets (order idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_2 }}" @@ -121,39 +121,39 @@ - secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" register: secrets_6 - ignore_errors: yes + ignore_errors: true - name: secrets (empty) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: [] register: secrets_7 - ignore_errors: yes + ignore_errors: true - name: secrets (empty idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: [] register: secrets_8 - ignore_errors: yes + ignore_errors: true - name: rolling secrets docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_3 }}_v1" filename: "/run/secrets/{{ secret_name_3 }}.txt" register: secrets_9 - ignore_errors: yes + ignore_errors: true - name: update rolling secret docker_secret: @@ -163,25 +163,25 @@ rolling_versions: true register: secrets_10 when: docker_py_version is version('2.1.0', '>=') - ignore_errors: yes + ignore_errors: true - name: rolling secrets service update docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_name: "{{ secret_name_3 }}_v2" filename: "/run/secrets/{{ secret_name_3 }}.txt" register: secrets_11 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -211,72 +211,72 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1000 register: secrets_1 - ignore_errors: yes + ignore_errors: true - name: secrets (uid int idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1000 register: secrets_2 - ignore_errors: yes + ignore_errors: true - name: secrets (uid int change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1002 register: secrets_3 - ignore_errors: yes + ignore_errors: true - name: secrets (uid str) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" uid: "1001" register: secrets_4 - ignore_errors: yes + ignore_errors: true - name: secrets (uid str idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" uid: "1001" register: secrets_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -300,72 +300,72 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1001 register: secrets_1 - ignore_errors: yes + ignore_errors: true - name: secrets (gid int idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1001 register: secrets_2 - ignore_errors: yes + ignore_errors: true - name: secrets (gid int change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1002 register: secrets_3 - ignore_errors: yes + ignore_errors: true - name: secrets (gid str) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" gid: "1003" register: secrets_4 - ignore_errors: yes + ignore_errors: true - name: secrets (gid str idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" gid: "1003" register: secrets_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -389,46 +389,46 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" mode: 0600 register: secrets_1 - ignore_errors: yes + ignore_errors: true - name: secrets (mode idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" mode: 0600 register: secrets_2 - ignore_errors: yes + ignore_errors: true - name: secrets (mode change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - secret_id: "{{ secret_result_1.secret_id|default('') }}" secret_name: "{{ secret_name_1 }}" mode: 0777 register: secrets_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -450,12 +450,12 @@ docker_secret: name: "{{ secret_name }}" state: absent - force: yes + force: true loop: - "{{ secret_name_1 }}" - "{{ secret_name_2 }}" - "{{ secret_name_3 }}" loop_control: loop_var: secret_name - ignore_errors: yes + ignore_errors: true when: docker_py_version is version('2.1.0', '>=') diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/update_config.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/update_config.yml index faae2a69..fb335a03 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/update_config.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/update_config.yml @@ -19,7 +19,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: delay: 5s @@ -29,7 +29,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: delay: 5s @@ -39,7 +39,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: delay: 12s @@ -49,7 +49,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -65,7 +65,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: failure_action: "pause" @@ -75,7 +75,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: failure_action: "pause" @@ -85,7 +85,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: failure_action: "continue" @@ -95,29 +95,29 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: failure_action: "rollback" register: update_failure_action_4 - ignore_errors: yes + ignore_errors: true - name: update_config.failure_action (rollback idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: failure_action: "rollback" register: update_failure_action_5 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -146,40 +146,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: max_failure_ratio: 0.25 register: update_max_failure_ratio_1 - ignore_errors: yes + ignore_errors: true - name: update_config.max_failure_ratio (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: max_failure_ratio: 0.25 register: update_max_failure_ratio_2 - ignore_errors: yes + ignore_errors: true - name: update_config.max_failure_ratio (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: max_failure_ratio: 0.50 register: update_max_failure_ratio_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -201,40 +201,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: monitor: 10s register: update_monitor_1 - ignore_errors: yes + ignore_errors: true - name: update_config.monitor (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: monitor: 10s register: update_monitor_2 - ignore_errors: yes + ignore_errors: true - name: update_config.monitor (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: monitor: 60s register: update_monitor_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -256,40 +256,40 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: order: "start-first" register: update_order_1 - ignore_errors: yes + ignore_errors: true - name: update_config.order (idempotency) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: order: "start-first" register: update_order_2 - ignore_errors: yes + ignore_errors: true - name: update_config.order (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: order: "stop-first" register: update_order_3 - ignore_errors: yes + ignore_errors: true - name: cleanup docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: @@ -311,7 +311,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: parallelism: 2 @@ -321,7 +321,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: parallelism: 2 @@ -331,7 +331,7 @@ docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" - resolve_image: no + resolve_image: false command: '/bin/sh -v -c "sleep 10m"' update_config: parallelism: 1 @@ -341,7 +341,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - diff: no + diff: false - assert: that: diff --git a/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml b/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml index d5f4cbdb..ee191138 100644 --- a/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml +++ b/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml @@ -20,7 +20,7 @@ - name: Try to get docker_swarm_service_info when docker is not running in swarm mode docker_swarm_service_info: name: "{{ service_name }}" - ignore_errors: yes + ignore_errors: true register: output - name: assert failure when called when swarm is not in use or not run on manager node @@ -72,7 +72,7 @@ docker_swarm_service: name: "{{ service_name }}" state: absent - ignore_errors: yes + ignore_errors: true - name: Remove swarm docker_swarm: diff --git a/tests/integration/targets/docker_volume_info/tasks/main.yml b/tests/integration/targets/docker_volume_info/tasks/main.yml index 24bd7f5f..09cb84d7 100644 --- a/tests/integration/targets/docker_volume_info/tasks/main.yml +++ b/tests/integration/targets/docker_volume_info/tasks/main.yml @@ -43,7 +43,7 @@ - name: "Comparison: use 'docker volume inspect'" command: docker volume inspect "{{ cname }}" register: docker_volume_inspect - ignore_errors: yes + ignore_errors: true - block: - set_fact: docker_volume_inspect_result: "{{ docker_volume_inspect.stdout | from_json }}" diff --git a/tests/integration/targets/generic_connection_tests/tasks/main.yml b/tests/integration/targets/generic_connection_tests/tasks/main.yml index 4a0c6336..abbb0295 100644 --- a/tests/integration/targets/generic_connection_tests/tasks/main.yml +++ b/tests/integration/targets/generic_connection_tests/tasks/main.yml @@ -52,7 +52,7 @@ loop: - nginx.conf register: can_copy_files - ignore_errors: yes + ignore_errors: true - when: can_copy_files is not failed block: @@ -62,7 +62,7 @@ path: '{{ remote_tmp_dir }}/{{ item }}.key' type: ECC curve: secp256r1 - force: yes + force: true loop: - cert - ca @@ -73,7 +73,7 @@ privatekey_path: '{{ remote_tmp_dir }}/ca.key' basic_constraints: - 'CA:TRUE' - basic_constraints_critical: yes + basic_constraints_critical: true - name: Create CA certificate community.crypto.x509_certificate: diff --git a/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml b/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml index 29341650..6f2a3b6c 100644 --- a/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml +++ b/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml @@ -5,13 +5,13 @@ - hosts: 127.0.0.1 connection: local - gather_facts: yes + gather_facts: true tasks: - name: remove docker containers docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true loop: - ansible-docker-test-docker-inventory-container-1 - ansible-docker-test-docker-inventory-container-2 diff --git a/tests/integration/targets/inventory_docker_containers/playbooks/docker_setup.yml b/tests/integration/targets/inventory_docker_containers/playbooks/docker_setup.yml index 5eabe47c..0c1f3368 100644 --- a/tests/integration/targets/inventory_docker_containers/playbooks/docker_setup.yml +++ b/tests/integration/targets/inventory_docker_containers/playbooks/docker_setup.yml @@ -6,7 +6,7 @@ - hosts: 127.0.0.1 connection: local vars: - docker_skip_cleanup: yes + docker_skip_cleanup: true tasks: - name: Setup docker diff --git a/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_1.yml b/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_1.yml index 9dbb7132..c0f28f57 100644 --- a/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_1.yml +++ b/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_1.yml @@ -5,7 +5,7 @@ - hosts: 127.0.0.1 connection: local # otherwise Ansible will complain that it cannot connect via ssh to 127.0.0.1:22 - gather_facts: no + gather_facts: false tasks: - name: Show all groups debug: diff --git a/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_2.yml b/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_2.yml index df2e9ff5..28f8dc00 100644 --- a/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_2.yml +++ b/tests/integration/targets/inventory_docker_containers/playbooks/test_inventory_2.yml @@ -5,7 +5,7 @@ - hosts: 127.0.0.1 connection: local # otherwise Ansible will complain that it cannot connect via ssh to 127.0.0.1:22 - gather_facts: no + gather_facts: false tasks: - name: Show all groups debug: @@ -33,7 +33,7 @@ connection: local vars: ansible_python_interpreter: "{{ ansible_playbook_python }}" - gather_facts: no + gather_facts: false tasks: - name: Show all variables debug: diff --git a/tests/integration/targets/inventory_docker_machine/playbooks/pre-setup.yml b/tests/integration/targets/inventory_docker_machine/playbooks/pre-setup.yml index b24c3818..3c6c1367 100644 --- a/tests/integration/targets/inventory_docker_machine/playbooks/pre-setup.yml +++ b/tests/integration/targets/inventory_docker_machine/playbooks/pre-setup.yml @@ -19,4 +19,4 @@ dest: /tmp/docker-machine - name: Install docker-machine binary command: install /tmp/docker-machine /usr/bin/docker-machine - become: yes + become: true diff --git a/tests/integration/targets/inventory_docker_machine/playbooks/test_inventory_1.yml b/tests/integration/targets/inventory_docker_machine/playbooks/test_inventory_1.yml index a4098eb3..fb58718d 100644 --- a/tests/integration/targets/inventory_docker_machine/playbooks/test_inventory_1.yml +++ b/tests/integration/targets/inventory_docker_machine/playbooks/test_inventory_1.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - hosts: 127.0.0.1 - gather_facts: no + gather_facts: false tasks: - name: sanity check Docker Machine output vars: @@ -33,7 +33,7 @@ - "'DOCKER_MACHINE_NAME=\"{{ hostvars['vm'].dm_DOCKER_MACHINE_NAME }}\"' in result.stdout" - hosts: vm - gather_facts: no + gather_facts: false tasks: - name: do something to verify that accept-new ssh setting was applied by the docker-machine inventory plugin raw: uname -a @@ -42,7 +42,7 @@ - debug: var=result.stdout - hosts: 127.0.0.1 - gather_facts: no + gather_facts: false environment: DOCKER_CERT_PATH: "{{ hostvars['vm'].dm_DOCKER_CERT_PATH }}" DOCKER_HOST: "{{ hostvars['vm'].dm_DOCKER_HOST }}" diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml index da9be518..4039a6bd 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml @@ -5,12 +5,12 @@ - hosts: 127.0.0.1 connection: local - gather_facts: yes + gather_facts: true tasks: - name: Make sure swarm is removed docker_swarm: state: absent - force: yes + force: true - name: remove docker pagkages action: "{{ ansible_facts.pkg_mgr }}" diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml index 98bd59f0..1ae4c63f 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml @@ -6,7 +6,7 @@ - hosts: 127.0.0.1 connection: local vars: - docker_skip_cleanup: yes + docker_skip_cleanup: true tasks: - name: Setup docker diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_1.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_1.yml index 69592bc3..77fcc371 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_1.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_1.yml @@ -5,7 +5,7 @@ - hosts: 127.0.0.1 connection: local # otherwise Ansible will complain that it cannot connect via ssh to 127.0.0.1:22 - gather_facts: no + gather_facts: false tasks: - name: Show all groups debug: @@ -32,22 +32,22 @@ - "groups.manager | length > 0" - "groups.worker | length >= 0" - "groups.leader | length == 1" - run_once: yes + run_once: true - name: List manager group debug: var: groups.manager - run_once: yes + run_once: true - name: List worker group debug: var: groups.worker - run_once: yes + run_once: true - name: List leader group debug: var: groups.leader - run_once: yes + run_once: true - name: Print ansible_host per host debug: diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_2.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_2.yml index f9b69c86..091b891a 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_2.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/test_inventory_2.yml @@ -5,7 +5,7 @@ - hosts: 127.0.0.1 connection: local # otherwise Ansible will complain that it cannot connect via ssh to 127.0.0.1:22 - gather_facts: no + gather_facts: false tasks: - name: Show all groups debug: diff --git a/tests/integration/targets/setup_docker/defaults/main.yml b/tests/integration/targets/setup_docker/defaults/main.yml index c120b5a3..0509fe0e 100644 --- a/tests/integration/targets/setup_docker/defaults/main.yml +++ b/tests/integration/targets/setup_docker/defaults/main.yml @@ -6,7 +6,7 @@ docker_cli_version: '0.0' docker_api_version: '0.0' docker_py_version: '0.0' -docker_skip_cleanup: yes +docker_skip_cleanup: true docker_prereq_packages: [] docker_packages: - docker-ce diff --git a/tests/integration/targets/setup_docker/tasks/Alpine.yml b/tests/integration/targets/setup_docker/tasks/Alpine.yml index b3044b88..64f6eb34 100644 --- a/tests/integration/targets/setup_docker/tasks/Alpine.yml +++ b/tests/integration/targets/setup_docker/tasks/Alpine.yml @@ -6,5 +6,5 @@ - name: Install docker apk: name: docker - update_cache: yes + update_cache: true notify: cleanup docker diff --git a/tests/integration/targets/setup_docker/tasks/Archlinux.yml b/tests/integration/targets/setup_docker/tasks/Archlinux.yml index 9015b088..3a67ff2b 100644 --- a/tests/integration/targets/setup_docker/tasks/Archlinux.yml +++ b/tests/integration/targets/setup_docker/tasks/Archlinux.yml @@ -6,5 +6,5 @@ - name: Install docker community.general.pacman: name: docker - update_cache: yes + update_cache: true notify: cleanup docker diff --git a/tests/integration/targets/setup_docker/tasks/Fedora.yml b/tests/integration/targets/setup_docker/tasks/Fedora.yml index e13ae086..039751a7 100644 --- a/tests/integration/targets/setup_docker/tasks/Fedora.yml +++ b/tests/integration/targets/setup_docker/tasks/Fedora.yml @@ -14,8 +14,8 @@ name: docker-ce-stable description: Docker CE Stable - $basearch baseurl: https://download.docker.com/linux/fedora/{{ 31 if ansible_facts.distribution_major_version|int > 31 else '$releasever' }}/$basearch/stable - enabled: yes - gpgcheck: yes + enabled: true + gpgcheck: true - name: Update cache command: dnf makecache diff --git a/tests/integration/targets/setup_docker/tasks/Suse.yml b/tests/integration/targets/setup_docker/tasks/Suse.yml index 945b728d..18974cb2 100644 --- a/tests/integration/targets/setup_docker/tasks/Suse.yml +++ b/tests/integration/targets/setup_docker/tasks/Suse.yml @@ -6,7 +6,7 @@ - name: Install docker 17 community.general.zypper: name: "{{ docker_packages if needs_docker_daemon else docker_cli_packages }}" - force: yes - disable_gpg_check: yes - update_cache: yes + force: true + disable_gpg_check: true + update_cache: true notify: cleanup docker diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml index a09d236d..f5f4e2ef 100644 --- a/tests/integration/targets/setup_docker/tasks/main.yml +++ b/tests/integration/targets/setup_docker/tasks/main.yml @@ -66,7 +66,7 @@ - name: Check Docker API version command: "docker version -f {% raw %}'{{(index .Server.Components 0).Details.ApiVersion}}'{% endraw %}" register: docker_api_version_stdout - ignore_errors: yes + ignore_errors: true - name: Limit docker pypi package version to < 4.3.0 set_fact: @@ -84,17 +84,17 @@ - name: Check Docker CLI version command: "docker version -f {% raw %}'{{.Client.Version}}'{% endraw %}" register: docker_cli_version_stdout - ignore_errors: yes + ignore_errors: true - name: Check Docker API version command: "{{ ansible_python.executable }} -c 'import docker; print(docker.from_env().version()[\"ApiVersion\"])'" register: docker_api_version_stdout - ignore_errors: yes + ignore_errors: true - name: Check docker-py API version command: "{{ ansible_python.executable }} -c 'import docker; print(docker.__version__)'" register: docker_py_version_stdout - ignore_errors: yes + ignore_errors: true - set_fact: docker_cli_version: "{{ docker_cli_version_stdout.stdout | default('0.0') }}" @@ -114,17 +114,17 @@ retries: 3 delay: 3 until: docker_containers is success - ignore_errors: yes + ignore_errors: true - name: "Remove all ansible-docker-test-* docker volumes" shell: 'docker volume ls --format {% raw %}"{{.Name}}"{% endraw %} | grep "^ansible-docker-test-" | xargs -r docker volume rm -f' register: docker_volumes - ignore_errors: yes + ignore_errors: true - name: "Remove all ansible-docker-test-* docker networks" shell: 'docker network ls --no-trunc --format {% raw %}"{{.Name}}"{% endraw %} | grep "^ansible-docker-test-" | xargs -r docker network rm' register: docker_networks - ignore_errors: yes + ignore_errors: true - name: Cleaned docker resources debug: @@ -139,22 +139,22 @@ - name: List all docker containers command: docker ps --no-trunc -a register: docker_containers - ignore_errors: yes + ignore_errors: true - name: List all docker volumes command: docker volume ls register: docker_volumes - ignore_errors: yes + ignore_errors: true - name: List all docker networks command: docker network ls --no-trunc register: docker_networks - ignore_errors: yes + ignore_errors: true - name: List all docker images command: docker images --no-trunc -a register: docker_images - ignore_errors: yes + ignore_errors: true - name: Still existing docker resources debug: diff --git a/tests/integration/targets/setup_docker_compose/tasks/Suse.yml b/tests/integration/targets/setup_docker_compose/tasks/Suse.yml index bf8db5c0..46e50fd4 100644 --- a/tests/integration/targets/setup_docker_compose/tasks/Suse.yml +++ b/tests/integration/targets/setup_docker_compose/tasks/Suse.yml @@ -6,7 +6,7 @@ - name: Install docker-compose as system package community.general.zypper: name: "{{ docker_compose_packages }}" - force: yes - disable_gpg_check: yes - update_cache: yes + force: true + disable_gpg_check: true + update_cache: true notify: cleanup docker diff --git a/tests/integration/targets/setup_docker_compose_v2/tasks/Suse.yml b/tests/integration/targets/setup_docker_compose_v2/tasks/Suse.yml index bf8db5c0..46e50fd4 100644 --- a/tests/integration/targets/setup_docker_compose_v2/tasks/Suse.yml +++ b/tests/integration/targets/setup_docker_compose_v2/tasks/Suse.yml @@ -6,7 +6,7 @@ - name: Install docker-compose as system package community.general.zypper: name: "{{ docker_compose_packages }}" - force: yes - disable_gpg_check: yes - update_cache: yes + force: true + disable_gpg_check: true + update_cache: true notify: cleanup docker diff --git a/tests/integration/targets/setup_docker_registry/handlers/cleanup.yml b/tests/integration/targets/setup_docker_registry/handlers/cleanup.yml index 5c04ebc8..0a1f363c 100644 --- a/tests/integration/targets/setup_docker_registry/handlers/cleanup.yml +++ b/tests/integration/targets/setup_docker_registry/handlers/cleanup.yml @@ -12,8 +12,8 @@ - name: "Get registry logs" command: "docker logs {{ docker_registry_container_name_registry }}" register: registry_logs - no_log: yes - ignore_errors: yes + no_log: true + ignore_errors: true - name: "Printing registry logs" debug: @@ -23,14 +23,14 @@ - name: "Get nginx logs for first instance" command: "docker logs {{ docker_registry_container_name_nginx }}" register: nginx_logs - no_log: yes - ignore_errors: yes + no_log: true + ignore_errors: true - name: "Get nginx logs for second instance" command: "docker logs {{ docker_registry_container_name_nginx2 }}" register: nginx2_logs - no_log: yes - ignore_errors: yes + no_log: true + ignore_errors: true - name: "Printing nginx logs for first instance" debug: @@ -46,7 +46,7 @@ docker_container: name: "{{ item }}" state: absent - force_kill: yes + force_kill: true with_items: "{{ docker_registry_setup_cnames }}" register: result retries: 3 @@ -56,4 +56,4 @@ - name: "Make sure all volumes are removed" command: "docker volume rm -f {{ item }}" with_items: "{{ docker_registry_setup_vnames }}" - ignore_errors: yes + ignore_errors: true diff --git a/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml b/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml index 66bc1dae..25bb2029 100644 --- a/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml +++ b/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml @@ -49,7 +49,7 @@ - nginx.conf - nginx.htpasswd register: can_copy_files - ignore_errors: yes + ignore_errors: true - when: can_copy_files is not failed block: @@ -59,7 +59,7 @@ path: '{{ remote_tmp_dir }}/cert.key' type: ECC curve: secp256r1 - force: yes + force: true - name: Create CSR for frontend certificate community.crypto.openssl_csr: diff --git a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml index a6f171bb..bc74b251 100644 --- a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml +++ b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml @@ -11,13 +11,13 @@ - set_fact: pkg_mgr: community.general.pkgng ansible_pkg_mgr: community.general.pkgng - cacheable: yes + cacheable: true when: ansible_os_family == "FreeBSD" - set_fact: pkg_mgr: community.general.zypper ansible_pkg_mgr: community.general.zypper - cacheable: yes + cacheable: true when: ansible_os_family == "Suse" - shell: diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml index e19d903e..cc74b70a 100644 --- a/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml +++ b/tests/integration/targets/setup_remote_tmp_dir/tasks/default-cleanup.yml @@ -7,4 +7,4 @@ file: path: "{{ remote_tmp_dir }}" state: absent - no_log: yes + no_log: true