From ddf0fe7167d835ad25c613a0d5b59d700f8c6293 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 26 Nov 2025 11:56:57 +0200 Subject: [PATCH] Fix Ansible `inject_facts_as_vars` deprecation warning --- roles/custom/matrix-client-element/defaults/main.yml | 2 +- roles/custom/matrix-synapse/defaults/main.yml | 2 +- roles/custom/matrix_playbook_migration/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index ee096431b..89ba1fcf6 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -26,7 +26,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme # Controls whether to patch webpack.config.js when self-building, so that building can pass on low-memory systems (< 4 GB RAM): # - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1357 # - https://github.com/element-hq/element-web/issues/19544 -matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}" +matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_facts['memtotal_mb'] < 4096 }}" # renovate: datasource=docker depName=ghcr.io/element-hq/element-web matrix_client_element_version: v1.12.4 diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index a9bd74b06..a4cc24145 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -675,7 +675,7 @@ matrix_synapse_caches_sync_response_cache_duration: "2m" # Controls how much memory this role thinks is available for cache-size-related calculations. # By default, all of the server's memory is taken into account, but you can adjust this. # You can also go for directly adjusting cache-sizes (matrix_synapse_cache_autotuning_max_cache_memory_usage, matrix_synapse_cache_autotuning_target_cache_memory_usage) instead of adjusting this. -matrix_synapse_cache_size_calculations_memtotal_bytes: "{{ (ansible_memtotal_mb * 1024 * 1024) | int }}" +matrix_synapse_cache_size_calculations_memtotal_bytes: "{{ (ansible_facts['memtotal_mb'] * 1024 * 1024) | int }}" # Controls the cap to use for matrix_synapse_cache_autotuning_max_cache_memory_usage. matrix_synapse_cache_size_calculations_max_cache_memory_usage_cap_bytes: "{{ (2 * 1024 * 1024 * 1024) }}" # 2GB diff --git a/roles/custom/matrix_playbook_migration/defaults/main.yml b/roles/custom/matrix_playbook_migration/defaults/main.yml index 78898231a..16f24ba4f 100644 --- a/roles/custom/matrix_playbook_migration/defaults/main.yml +++ b/roles/custom/matrix_playbook_migration/defaults/main.yml @@ -55,7 +55,7 @@ matrix_playbook_migration_matrix_postmoogle_migration_validation_enabled: true # - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2999 # - https://github.com/geerlingguy/ansible-role-docker/pull/410 matrix_playbook_migration_debian_signedby_migration_enabled: true -matrix_playbook_migration_debian_signedby_migration_repository_path: "/etc/apt/sources.list.d/download_docker_com_linux_{{ ansible_distribution | lower }}.list" +matrix_playbook_migration_debian_signedby_migration_repository_path: "/etc/apt/sources.list.d/download_docker_com_linux_{{ ansible_facts['distribution'] | lower }}.list" # Controls if the old apt repository for Docker (`signed-by=/etc/apt/trusted.gpg.d/docker.asc`) will be removed, # so that the Docker role (7.2.0+) can install a new non-conflicting one (`signed-by=/etc/apt/keyrings/docker.asc`).