diff --git a/roles/custom/matrix-bridge-meshtastic-relay/defaults/main.yml b/roles/custom/matrix-bridge-meshtastic-relay/defaults/main.yml index 98e881843..bf6326362 100644 --- a/roles/custom/matrix-bridge-meshtastic-relay/defaults/main.yml +++ b/roles/custom/matrix-bridge-meshtastic-relay/defaults/main.yml @@ -15,7 +15,6 @@ matrix_meshtastic_relay_container_image: "{{ matrix_meshtastic_relay_container_i matrix_meshtastic_relay_container_image_registry_prefix: "{{ matrix_meshtastic_relay_container_image_registry_prefix_upstream }}" matrix_meshtastic_relay_container_image_registry_prefix_upstream: "{{ matrix_meshtastic_relay_container_image_registry_prefix_upstream_default }}" matrix_meshtastic_relay_container_image_registry_prefix_upstream_default: "ghcr.io/" -matrix_meshtastic_relay_container_image_force_pull: "{{ matrix_meshtastic_relay_container_image.endswith(':latest') }}" matrix_meshtastic_relay_base_path: "{{ matrix_base_data_path }}/meshtastic-relay" diff --git a/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml b/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml index 0df0ef6d8..95721f983 100644 --- a/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml @@ -6,11 +6,9 @@ --- - name: Ensure matrix-meshtastic-relay image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_meshtastic_relay_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_meshtastic_relay_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" - force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_meshtastic_relay_container_image_force_pull }}" + pull: always register: matrix_meshtastic_relay_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" diff --git a/roles/custom/matrix-bridge-meshtastic-relay/tasks/validate_config.yml b/roles/custom/matrix-bridge-meshtastic-relay/tasks/validate_config.yml index 80f31d47f..4b9a4bafa 100644 --- a/roles/custom/matrix-bridge-meshtastic-relay/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-meshtastic-relay/tasks/validate_config.yml @@ -21,3 +21,11 @@ `matrix_meshtastic_relay_connection_type` must be one of: `tcp`, `serial`, `ble`. Got: `{{ matrix_meshtastic_relay_connection_type }}`. when: "matrix_meshtastic_relay_connection_type not in ['tcp', 'serial', 'ble']" + +- name: (Deprecation) Catch and report renamed matrix-meshtastic-relay 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_meshtastic_relay_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'}