Move items to catch and report the variables

Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>

roles/custom/matrix-synapse-admin/tasks/validate_config.yml

@@ -6,20 +6,6 @@
 
 ---
 
-- name: (Deprecation) Catch and report renamed synapse-admin settings
-  ansible.builtin.fail:
-    msg: >-
-      Your configuration contains a variable, which now has a different name.
-      Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
-  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
-  with_items:
-    - {'old': 'synapse_admin_docker_repo', 'new': 'synapse_admin_container_self_build_repo'}
-    - {'old': 'synapse_admin_container_self_build', 'new': 'synapse_admin_container_image_self_build'}
-    - {'old': 'synapse_admin_container_self_build_repo', 'new': 'synapse_admin_container_image_self_build_repo'}
-    - {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'}
-    - {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
-    - {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'}
-
 - when: synapse_admin_container_labels_traefik_enabled | bool
   block:
     - name: Fail if required synapse-admin Traefik settings not defined

roles/custom/matrix_playbook_migration/tasks/validate_config.yml

@@ -101,6 +101,12 @@
     - {'old': 'synapse_admin_docker_image_registry_prefix_upstream_default', 'new': 'synapse_admin_container_image_registry_prefix_upstream_default'}
     - {'old': 'synapse_admin_container_uid', 'new': 'synapse_admin_uid'}
     - {'old': 'synapse_admin_container_gid', 'new': 'synapse_admin_gid'}
+    - {'old': 'synapse_admin_docker_repo', 'new': 'synapse_admin_container_self_build_repo'}
+    - {'old': 'synapse_admin_container_self_build', 'new': 'synapse_admin_container_image_self_build'}
+    - {'old': 'synapse_admin_container_self_build_repo', 'new': 'synapse_admin_container_image_self_build_repo'}
+    - {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'}
+    - {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
+    - {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'}
 
 - name: (Deprecation) Catch and report matrix_postgres variables
   ansible.builtin.fail: