Fix misleading task names and wording in deprecation checks

Four checks carried the task name of the check they were copy-pasted
from, so the redis -> valkey and keydb -> valkey checks both announced
themselves as matrix_redis ones, and both synapse OIDC label checks
announced themselves as matrix_ssl ones.

The matrix_nginx_proxy and matrix_ssl leftover messages also asked
people to rename variables, while the sentence right above them
(correctly) asks for these to be removed. The roles are gone, so there
is nothing to rename them to.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
2026-08-04 17:15:55 +03:00
parent bd8a79c974
commit cbc2dc3d0a
@@ -273,7 +273,7 @@
matrix_playbook_migration_redis_migration_vars: |- matrix_playbook_migration_redis_migration_vars: |-
{{ lookup('ansible.builtin.varnames', '^redis_.+', wantlist=True) }} {{ lookup('ansible.builtin.varnames', '^redis_.+', wantlist=True) }}
- name: (Deprecation) Catch and report matrix_redis variables - name: (Deprecation) Catch and report redis variables
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-
The Redis role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey. The Redis role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey.
@@ -291,7 +291,7 @@
matrix_playbook_migration_keydb_migration_vars: |- matrix_playbook_migration_keydb_migration_vars: |-
{{ lookup('ansible.builtin.varnames', '^keydb_.+', wantlist=True) }} {{ lookup('ansible.builtin.varnames', '^keydb_.+', wantlist=True) }}
- name: (Deprecation) Catch and report matrix_redis variables - name: (Deprecation) Catch and report keydb variables
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-
The KeyDB role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey. The KeyDB role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey.
@@ -479,7 +479,7 @@
You should remove all its variables (`matrix_nginx_proxy_*`) from your configuration file (vars.yml). You should remove all its variables (`matrix_nginx_proxy_*`) from your configuration file (vars.yml).
The following variables in your configuration should be renamed: {{ matrix_playbook_migration_nginx_proxy_migration_vars | join(', ') }} The following variables in your configuration need to be removed: {{ matrix_playbook_migration_nginx_proxy_migration_vars | join(', ') }}
when: "matrix_playbook_migration_nginx_proxy_migration_vars | length > 0" when: "matrix_playbook_migration_nginx_proxy_migration_vars | length > 0"
- when: matrix_playbook_migration_matrix_ssl_leftover_variable_checks_enabled | bool - when: matrix_playbook_migration_matrix_ssl_leftover_variable_checks_enabled | bool
@@ -495,7 +495,7 @@
You should remove all its variables (`matrix_ssl_*`) from your configuration file (vars.yml). You should remove all its variables (`matrix_ssl_*`) from your configuration file (vars.yml).
The following variables in your configuration should be renamed: {{ matrix_playbook_migration_ssl_migration_vars | join(', ') }} The following variables in your configuration need to be removed: {{ matrix_playbook_migration_ssl_migration_vars | join(', ') }}
when: "matrix_playbook_migration_ssl_migration_vars | length > 0" when: "matrix_playbook_migration_ssl_migration_vars | length > 0"
- block: - block:
@@ -503,7 +503,7 @@
matrix_playbook_migration_matrix_synapse_container_labels_public_client_synapse_oidc_vars: |- matrix_playbook_migration_matrix_synapse_container_labels_public_client_synapse_oidc_vars: |-
{{ lookup('ansible.builtin.varnames', '^matrix_synapse_container_labels_public_client_synapse_oidc_.+', wantlist=True) }} {{ lookup('ansible.builtin.varnames', '^matrix_synapse_container_labels_public_client_synapse_oidc_.+', wantlist=True) }}
- name: (Deprecation) Catch and report matrix_ssl variables - name: (Deprecation) Catch and report matrix_synapse_container_labels_public_client_synapse_oidc variables
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-
We found usage of the following variables which are now removed: {{ matrix_playbook_migration_matrix_synapse_container_labels_public_client_synapse_oidc_vars | join(', ') }} We found usage of the following variables which are now removed: {{ matrix_playbook_migration_matrix_synapse_container_labels_public_client_synapse_oidc_vars | join(', ') }}
@@ -514,7 +514,7 @@
matrix_playbook_migration_matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_vars: |- matrix_playbook_migration_matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_vars: |-
{{ lookup('ansible.builtin.varnames', '^matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_.+', wantlist=True) }} {{ lookup('ansible.builtin.varnames', '^matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_.+', wantlist=True) }}
- name: (Deprecation) Catch and report matrix_ssl variables - name: (Deprecation) Catch and report matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc variables
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-
We found usage of the following variables which are now removed: {{ matrix_playbook_migration_matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_vars | join(', ') }} We found usage of the following variables which are now removed: {{ matrix_playbook_migration_matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_oidc_vars | join(', ') }}