This should bring better compatibility with future Ansible versions, one of which will some day drop support for accessing facts via the global namespace. Ref: https://github.com/geerlingguy/ansible-role-docker/pull/513pull/4529/head
| @@ -161,7 +161,7 @@ matrix_federation_traefik_entrypoint_tls: true | |||||
| # Recognized values by us are 'amd64', 'arm32' and 'arm64'. | # Recognized values by us are 'amd64', 'arm32' and 'arm64'. | ||||
| # Not all architectures support all services, so your experience (on non-amd64) may vary. | # Not all architectures support all services, so your experience (on non-amd64) may vary. | ||||
| # See docs/alternative-architectures.md | # See docs/alternative-architectures.md | ||||
| matrix_architecture: "{{ 'amd64' if ansible_architecture == 'x86_64' else ('arm64' if ansible_architecture == 'aarch64' else ('arm32' if ansible_architecture.startswith('armv') else '')) }}" | |||||
| matrix_architecture: "{{ 'amd64' if ansible_facts.architecture == 'x86_64' else ('arm64' if ansible_facts.architecture == 'aarch64' else ('arm32' if ansible_facts.architecture.startswith('armv') else '')) }}" | |||||
| # The architecture for Debian packages. | # The architecture for Debian packages. | ||||
| # See: https://wiki.debian.org/SupportedArchitectures | # See: https://wiki.debian.org/SupportedArchitectures | ||||
| @@ -6,11 +6,11 @@ | |||||
| # This is for both RedHat 7 and 8 | # This is for both RedHat 7 and 8 | ||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_redhat.yml" | - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_redhat.yml" | ||||
| when: ansible_os_family == 'RedHat' | |||||
| when: ansible_facts.os_family == 'RedHat' | |||||
| # This is for both Debian and Raspbian | # This is for both Debian and Raspbian | ||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_debian.yml" | - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_debian.yml" | ||||
| when: ansible_os_family == 'Debian' | |||||
| when: ansible_facts.os_family == 'Debian' | |||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_archlinux.yml" | - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_fuse_installed_archlinux.yml" | ||||
| when: ansible_os_family == 'Archlinux' | |||||
| when: ansible_facts.os_family == 'Archlinux' | |||||
| @@ -64,7 +64,7 @@ | |||||
| - name: Fail if matrix_architecture is set incorrectly | - name: Fail if matrix_architecture is set incorrectly | ||||
| ansible.builtin.fail: | ansible.builtin.fail: | ||||
| msg: "Detected that variable matrix_architecture {{ matrix_architecture }} appears to be set incorrectly. See docs/alternative-architectures.md. Server appears to be {{ ansible_architecture }}." | |||||
| msg: "Detected that variable matrix_architecture {{ matrix_architecture }} appears to be set incorrectly. See docs/alternative-architectures.md. Server appears to be {{ ansible_facts.architecture }}." | |||||
| when: matrix_architecture not in ['amd64', 'arm32', 'arm64'] | when: matrix_architecture not in ['amd64', 'arm32', 'arm64'] | ||||
| - name: Fail if matrix_playbook_reverse_proxy_type is set incorrectly | - name: Fail if matrix_playbook_reverse_proxy_type is set incorrectly | ||||
| @@ -10,7 +10,7 @@ | |||||
| block: | block: | ||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" | - ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" | ||||
| - when: ansible_os_family == 'Debian' and matrix_playbook_docker_installation_enabled | bool and matrix_playbook_migration_debian_signedby_migration_enabled | bool | |||||
| - when: ansible_facts.os_family == 'Debian' and matrix_playbook_docker_installation_enabled | bool and matrix_playbook_migration_debian_signedby_migration_enabled | bool | |||||
| tags: | tags: | ||||
| - setup-all | - setup-all | ||||
| - install-all | - install-all | ||||
| @@ -19,7 +19,7 @@ | |||||
| block: | block: | ||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/debian_docker_signedby_migration.yml" | - ansible.builtin.include_tasks: "{{ role_path }}/tasks/debian_docker_signedby_migration.yml" | ||||
| - when: ansible_os_family == 'Debian' and matrix_playbook_docker_installation_enabled | bool and matrix_playbook_migration_docker_trusted_gpg_d_migration_enabled | bool | |||||
| - when: ansible_facts.os_family == 'Debian' and matrix_playbook_docker_installation_enabled | bool and matrix_playbook_migration_docker_trusted_gpg_d_migration_enabled | bool | |||||
| tags: | tags: | ||||
| - setup-all | - setup-all | ||||
| - install-all | - install-all | ||||