From fc40951272aab4ef0cc6dd46471a822e3234695f Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 25 Oct 2025 10:36:36 +0200 Subject: [PATCH] Improve Ansible code. --- .../targets/docker_node/tasks/test_node.yml | 2 +- .../docker_node_info/tasks/test_node_info.yml | 2 +- .../targets/docker_stack/tasks/test_stack.yml | 10 +++--- .../docker_swarm/tasks/tests/basic.yml | 12 +++---- .../docker_swarm/tasks/tests/options-ca.yml | 4 +-- .../docker_swarm/tasks/tests/options.yml | 4 +-- .../tasks/test_swarm_info.yml | 4 +-- .../docker_swarm_service/tasks/main.yml | 2 +- .../tasks/tests/configs.yml | 32 +++++++++---------- .../docker_swarm_service/tasks/tests/misc.yml | 2 +- .../tasks/tests/secrets.yml | 32 +++++++++---------- .../tasks/test_docker_swarm_service_info.yml | 2 +- .../playbooks/swarm_setup.yml | 2 +- .../targets/setup_docker/tasks/Debian.yml | 2 +- .../targets/setup_docker/tasks/Fedora.yml | 2 +- .../targets/setup_docker/tasks/main.yml | 2 +- .../setup_docker_cli_buildx/tasks/main.yml | 2 +- .../setup_docker_cli_compose/tasks/main.yml | 2 +- .../targets/setup_podman/tasks/main.yml | 2 +- .../setup_remote_tmp_dir/tasks/main.yml | 2 +- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/tests/integration/targets/docker_node/tasks/test_node.yml b/tests/integration/targets/docker_node/tasks/test_node.yml index e92b1c3e..dda9be34 100644 --- a/tests/integration/targets/docker_node/tasks/test_node.yml +++ b/tests/integration/targets/docker_node/tasks/test_node.yml @@ -23,7 +23,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster 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 7798f646..8a6e5e55 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 @@ -23,7 +23,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster diff --git a/tests/integration/targets/docker_stack/tasks/test_stack.yml b/tests/integration/targets/docker_stack/tasks/test_stack.yml index d1938f11..eca04231 100644 --- a/tests/integration/targets/docker_stack/tasks/test_stack.yml +++ b/tests/integration/targets/docker_stack/tasks/test_stack.yml @@ -51,8 +51,8 @@ - name: Template compose files ansible.builtin.template: - src: "{{item}}" - dest: "{{remote_tmp_dir}}/" + src: "{{ item }}" + dest: "{{ remote_tmp_dir }}/" with_items: - stack_compose_base.yml - stack_compose_overrides.yml @@ -63,7 +63,7 @@ state: present name: test_stack compose: - - "{{remote_tmp_dir}}/stack_compose_base.yml" + - "{{ remote_tmp_dir }}/stack_compose_base.yml" - name: assert test_stack changed on stack creation with compose file ansible.builtin.assert: @@ -77,8 +77,8 @@ # state: present # name: test_stack # compose: - # - "{{stack_compose_base}}" - # - "{{stack_compose_overrides}}" + # - "{{ stack_compose_base }}" + # - "{{ stack_compose_overrides }}" # # - name: assert test_stack correctly changed on update with yaml # assert: diff --git a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml index ee0cc305..cccff4a7 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml @@ -40,7 +40,7 @@ - name: Create a Swarm cluster (check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" check_mode: true diff: true register: output_1 @@ -48,21 +48,21 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" diff: true register: output_2 - name: Create a Swarm cluster (idempotent) community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" diff: true register: output_3 - name: Create a Swarm cluster (idempotent, check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" check_mode: true diff: true register: output_4 @@ -70,7 +70,7 @@ - name: Create a Swarm cluster (force re-create) community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" force: true diff: true register: output_5 @@ -78,7 +78,7 @@ - name: Create a Swarm cluster (force re-create, check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" force: true check_mode: true diff: true diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml index c90dff3f..c965162b 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml @@ -58,7 +58,7 @@ register: ansible_keys - name: signing_ca_cert and signing_ca_key (check mode) community.docker.docker_swarm: - advertise_addr: '{{ansible_default_ipv4.address | default("127.0.0.1")}}' + advertise_addr: '{{ ansible_default_ipv4.address | default("127.0.0.1") }}' state: present signing_ca_cert: '{{ ansible_certificates.results[0].content | b64decode }}' signing_ca_key: '{{ ansible_keys.results[0].content | b64decode }}' @@ -69,7 +69,7 @@ ignore_errors: true - name: signing_ca_cert and signing_ca_key community.docker.docker_swarm: - advertise_addr: '{{ansible_default_ipv4.address | default("127.0.0.1")}}' + advertise_addr: '{{ ansible_default_ipv4.address | default("127.0.0.1") }}' state: present signing_ca_cert: '{{ ansible_certificates.results[0].content | b64decode }}' signing_ca_key: '{{ ansible_keys.results[0].content | b64decode }}' diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options.yml b/tests/integration/targets/docker_swarm/tasks/tests/options.yml index 71f9fda2..98fe693d 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options.yml @@ -9,7 +9,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" name: default diff: true @@ -72,7 +72,7 @@ community.docker.docker_swarm: state: present force: true - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" autolock_managers: true diff: true register: output_7 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 910cebfc..c9bb82dd 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 @@ -27,7 +27,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster @@ -160,7 +160,7 @@ - name: Update swarm cluster to be locked community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" autolock_managers: true register: autolock_managers_update_output ignore_errors: true diff --git a/tests/integration/targets/docker_swarm_service/tasks/main.yml b/tests/integration/targets/docker_swarm_service/tasks/main.yml index cd5ef19a..ee966686 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/main.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/main.yml @@ -27,7 +27,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" - ansible.builtin.include_tasks: run-test.yml with_fileglob: 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 4ebd6262..44834735 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml @@ -47,7 +47,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" register: configs_1 @@ -72,7 +72,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" - config_name: "{{ config_name_2 }}" @@ -89,7 +89,7 @@ configs: - config_name: "{{ config_name_1 }}" filename: "/tmp/{{ config_name_1 }}.txt" - - config_id: "{{ config_result_2.config_id|default('') }}" + - config_id: "{{ config_result_2.config_id | default('') }}" config_name: "{{ config_name_2 }}" filename: "/tmp/{{ config_name_2 }}.txt" register: configs_4 @@ -215,7 +215,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" uid: 1000 register: configs_1 @@ -228,7 +228,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" uid: 1000 register: configs_2 @@ -241,7 +241,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" uid: 1002 register: configs_3 @@ -254,7 +254,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" uid: "1001" register: configs_4 @@ -267,7 +267,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" uid: "1001" register: configs_5 @@ -305,7 +305,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" gid: 1000 register: configs_1 @@ -318,7 +318,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" gid: 1000 register: configs_2 @@ -331,7 +331,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" gid: 1002 register: configs_3 @@ -344,7 +344,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" gid: "1001" register: configs_4 @@ -357,7 +357,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" gid: "1001" register: configs_5 @@ -394,7 +394,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" mode: "0600" register: configs_1 @@ -407,7 +407,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" mode: "0600" register: configs_2 @@ -420,7 +420,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' configs: - - config_id: "{{ config_result_1.config_id|default('') }}" + - config_id: "{{ config_result_1.config_id | default('') }}" config_name: "{{ config_name_1 }}" mode: "0777" register: configs_3 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 e71efbfd..548a1e95 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml @@ -96,7 +96,7 @@ - name: fake image key as it is not predictable ansible.builtin.set_fact: - ansible_docker_service_output: "{{ output.swarm_service|combine({'image': docker_test_image_busybox}) }}" + ansible_docker_service_output: "{{ output.swarm_service | combine({'image': docker_test_image_busybox}) }}" - name: assert service matches expectations ansible.builtin.assert: 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 3cce577a..bd3aaa8e 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml @@ -47,7 +47,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" register: secrets_1 @@ -72,7 +72,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" - secret_name: "{{ secret_name_2 }}" @@ -89,7 +89,7 @@ secrets: - secret_name: "{{ secret_name_1 }}" filename: "/run/secrets/{{ secret_name_1 }}.txt" - - secret_id: "{{ secret_result_2.secret_id|default('') }}" + - secret_id: "{{ secret_result_2.secret_id | default('') }}" secret_name: "{{ secret_name_2 }}" filename: "/run/secrets/{{ secret_name_2 }}.txt" register: secrets_4 @@ -214,7 +214,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1000 register: secrets_1 @@ -227,7 +227,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1000 register: secrets_2 @@ -240,7 +240,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" uid: 1002 register: secrets_3 @@ -253,7 +253,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" uid: "1001" register: secrets_4 @@ -266,7 +266,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" uid: "1001" register: secrets_5 @@ -303,7 +303,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1001 register: secrets_1 @@ -316,7 +316,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1001 register: secrets_2 @@ -329,7 +329,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" gid: 1002 register: secrets_3 @@ -342,7 +342,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" gid: "1003" register: secrets_4 @@ -355,7 +355,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" gid: "1003" register: secrets_5 @@ -392,7 +392,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" mode: "0600" register: secrets_1 @@ -405,7 +405,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" mode: "0600" register: secrets_2 @@ -418,7 +418,7 @@ resolve_image: false command: '/bin/sh -v -c "sleep 10m"' secrets: - - secret_id: "{{ secret_result_1.secret_id|default('') }}" + - secret_id: "{{ secret_result_1.secret_id | default('') }}" secret_name: "{{ secret_name_1 }}" mode: "0777" register: secrets_3 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 def419e2..6a69940d 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 @@ -32,7 +32,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" register: output - name: Create services 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 24153b2f..03072285 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml @@ -20,4 +20,4 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" + advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml index b100a1f0..8ac536a7 100644 --- a/tests/integration/targets/setup_docker/tasks/Debian.yml +++ b/tests/integration/targets/setup_docker/tasks/Debian.yml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later - name: Get OS version - ansible.builtin.shell: uname -r + ansible.builtin.command: uname -r register: os_version - name: Install pre-reqs diff --git a/tests/integration/targets/setup_docker/tasks/Fedora.yml b/tests/integration/targets/setup_docker/tasks/Fedora.yml index 21c8325a..738a9db1 100644 --- a/tests/integration/targets/setup_docker/tasks/Fedora.yml +++ b/tests/integration/targets/setup_docker/tasks/Fedora.yml @@ -13,7 +13,7 @@ file: docker-ce 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 + baseurl: https://download.docker.com/linux/fedora/{{ 31 if ansible_facts.distribution_major_version | int > 31 else '$releasever' }}/$basearch/stable enabled: true gpgcheck: true diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml index fe22759c..bef9f1a2 100644 --- a/tests/integration/targets/setup_docker/tasks/main.yml +++ b/tests/integration/targets/setup_docker/tasks/main.yml @@ -25,7 +25,7 @@ ansible.builtin.set_fact: needs_docker_daemon: '{{ not ansible_module_running_in_container }}' - - name: + - name: Print information ansible.builtin.debug: msg: |- OS family: {{ ansible_facts.os_family }} diff --git a/tests/integration/targets/setup_docker_cli_buildx/tasks/main.yml b/tests/integration/targets/setup_docker_cli_buildx/tasks/main.yml index 85512e44..4fb7eb7f 100644 --- a/tests/integration/targets/setup_docker_cli_buildx/tasks/main.yml +++ b/tests/integration/targets/setup_docker_cli_buildx/tasks/main.yml @@ -11,7 +11,7 @@ - name: Setup Docker when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6'] block: - - name: + - name: Print information ansible.builtin.debug: msg: |- OS family: {{ ansible_facts.os_family }} diff --git a/tests/integration/targets/setup_docker_cli_compose/tasks/main.yml b/tests/integration/targets/setup_docker_cli_compose/tasks/main.yml index e6c05f7a..72ce2d43 100644 --- a/tests/integration/targets/setup_docker_cli_compose/tasks/main.yml +++ b/tests/integration/targets/setup_docker_cli_compose/tasks/main.yml @@ -11,7 +11,7 @@ - name: Setup Docker when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6'] block: - - name: + - name: Print information ansible.builtin.debug: msg: |- OS family: {{ ansible_facts.os_family }} diff --git a/tests/integration/targets/setup_podman/tasks/main.yml b/tests/integration/targets/setup_podman/tasks/main.yml index 421ff69f..08913340 100644 --- a/tests/integration/targets/setup_podman/tasks/main.yml +++ b/tests/integration/targets/setup_podman/tasks/main.yml @@ -25,7 +25,7 @@ - when: not podman_setup_marker.stat.exists and not ansible_module_running_in_container block: - - name: + - name: Print information ansible.builtin.debug: msg: |- OS family: {{ ansible_facts.os_family }} diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml index 483d034b..51e4b800 100644 --- a/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml +++ b/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml @@ -13,7 +13,7 @@ gather_subset: distribution when: ansible_facts == {} -- ansible.builtin.include_tasks: "{{ lookup('first_found', files)}}" +- ansible.builtin.include_tasks: "{{ lookup('first_found', files) }}" vars: files: - "{{ ansible_os_family | lower }}.yml"