ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-03-15 19:58:28 +00:00
Code Packages Projects Releases Wiki Activity

Improve Ansible code.

Browse Source
This commit is contained in:
Felix Fontein 2025-10-25 10:36:36 +02:00
parent b24bce77b6
commit fc40951272
20 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/targets/docker_node/tasks/test_node.yml
View File

@ -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

2
tests/integration/targets/docker_node_info/tasks/test_node_info.yml
View File

@ -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

10
tests/integration/targets/docker_stack/tasks/test_stack.yml
View File

@ -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:

12
tests/integration/targets/docker_swarm/tasks/tests/basic.yml
View File

@ -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

4
tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml
View File

@ -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 }}'

4
tests/integration/targets/docker_swarm/tasks/tests/options.yml
View File

@ -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

4
tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml
View File

@ -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

2
tests/integration/targets/docker_swarm_service/tasks/main.yml
View File

@ -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:

32
tests/integration/targets/docker_swarm_service/tasks/tests/configs.yml
View File

@ -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

2
tests/integration/targets/docker_swarm_service/tasks/tests/misc.yml
View File

@ -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:

32
tests/integration/targets/docker_swarm_service/tasks/tests/secrets.yml
View File

@ -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

2
tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml
View File

@ -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

2
tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml
View File

@ -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') }}"

2
tests/integration/targets/setup_docker/tasks/Debian.yml
View File

@ -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

2
tests/integration/targets/setup_docker/tasks/Fedora.yml
View File

@ -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

2
tests/integration/targets/setup_docker/tasks/main.yml
View File

@ -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 }}

2
tests/integration/targets/setup_docker_cli_buildx/tasks/main.yml
View File

@ -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 }}

2
tests/integration/targets/setup_docker_cli_compose/tasks/main.yml
View File

@ -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 }}

2
tests/integration/targets/setup_podman/tasks/main.yml
View File

@ -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 }}

2
tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml
View File

@ -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"