diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml index c4c202bad..2926ea612 100644 --- a/roles/custom/matrix-element-call/defaults/main.yml +++ b/roles/custom/matrix-element-call/defaults/main.yml @@ -39,7 +39,6 @@ matrix_element_call_container_image_registry_prefix: "{{ matrix_element_call_con matrix_element_call_container_image_registry_prefix_upstream: "{{ matrix_element_call_container_image_registry_prefix_upstream_default }}" matrix_element_call_container_image_registry_prefix_upstream_default: ghcr.io/ matrix_element_call_container_image_tag: "{{ matrix_element_call_version }}" -matrix_element_call_container_image_force_pull: "{{ matrix_element_call_container_image.endswith(':latest') }}" matrix_element_call_container_network: matrix-element-call diff --git a/roles/custom/matrix-element-call/tasks/install.yml b/roles/custom/matrix-element-call/tasks/install.yml index 4cd587e35..3c1983543 100644 --- a/roles/custom/matrix-element-call/tasks/install.yml +++ b/roles/custom/matrix-element-call/tasks/install.yml @@ -35,10 +35,9 @@ register: matrix_element_call_support_files_result - name: Ensure Element Call container image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_element_call_container_image }}" - source: pull - force_source: "{{ matrix_element_call_container_image_force_pull }}" + pull: always register: matrix_element_call_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" diff --git a/roles/custom/matrix-element-call/tasks/validate_config.yml b/roles/custom/matrix-element-call/tasks/validate_config.yml index dec4027dd..cd1245883 100644 --- a/roles/custom/matrix-element-call/tasks/validate_config.yml +++ b/roles/custom/matrix-element-call/tasks/validate_config.yml @@ -32,3 +32,11 @@ Element Call with a path prefix other than '/' is not supported yet. You have configured matrix_element_call_path_prefix to '{{ matrix_element_call_path_prefix }}'. when: "matrix_element_call_path_prefix != '/'" + +- name: (Deprecation) Catch and report renamed Element Call variables + ansible.builtin.fail: + msg: >- + The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead. + when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0" + with_items: + - {'old': 'matrix_element_call_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'}