Rework all roles to include component_(docker|container)_image_registry_prefix*
variables
This: - brings consistency - no more mixing `_name_prefix` and `_registry_prefix` - adds extensibility - a future patch will allow reconfiguring all registry prefixes for all roles in the playbook We still have `_docker_` vs `_container_` inconsistencies. These may be worked on later.
This commit is contained in:
@ -21,8 +21,10 @@ matrix_synapse_usage_exporter_container_image_self_build: true
|
||||
matrix_synapse_usage_exporter_container_image_self_build_repo: "https://github.com/loelkes/synapse-usage-exporter.git"
|
||||
|
||||
matrix_synapse_usage_exporter_container_image_path: "loelkes/synapse-usage-exporter"
|
||||
matrix_synapse_usage_exporter_container_image: "{{ matrix_synapse_usage_exporter_container_image_name_prefix }}{{ matrix_synapse_usage_exporter_container_image_path }}:{{ matrix_synapse_usage_exporter_container_image_tag }}"
|
||||
matrix_synapse_usage_exporter_container_image_name_prefix: "{{ 'localhost/' if matrix_synapse_usage_exporter_container_image_self_build else 'docker.io/' }}"
|
||||
matrix_synapse_usage_exporter_container_image: "{{ matrix_synapse_usage_exporter_container_image_registry_prefix }}{{ matrix_synapse_usage_exporter_container_image_path }}:{{ matrix_synapse_usage_exporter_container_image_tag }}"
|
||||
matrix_synapse_usage_exporter_container_image_registry_prefix: "{{ 'localhost/' if matrix_synapse_usage_exporter_container_image_self_build else matrix_synapse_usage_exporter_container_image_registry_prefix_upstream }}"
|
||||
matrix_synapse_usage_exporter_container_image_registry_prefix_upstream: "{{ matrix_synapse_usage_exporter_container_image_registry_prefix_upstream_default }}"
|
||||
matrix_synapse_usage_exporter_container_image_registry_prefix_upstream_default: "docker.io/"
|
||||
matrix_synapse_usage_exporter_container_image_tag: "{{ 'main' if matrix_synapse_usage_exporter_container_image_self_build else 'latest' }}"
|
||||
matrix_synapse_usage_exporter_container_image_force_pull: "{{ matrix_synapse_usage_exporter_container_image.endswith(':latest') }}"
|
||||
|
||||
|
@ -6,6 +6,9 @@
|
||||
- install-all
|
||||
- install-synapse-usage-exporter
|
||||
block:
|
||||
- when: matrix_synapse_usage_exporter_enabled | bool
|
||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
|
||||
- when: matrix_synapse_usage_exporter_enabled | bool
|
||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
|
||||
|
||||
|
@ -0,0 +1,10 @@
|
||||
---
|
||||
|
||||
- name: (Deprecation) Catch and report renamed matrix-synapse-usage-exporter settings
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Your configuration contains a variable, which now has a different name.
|
||||
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
|
||||
when: "item.old in vars"
|
||||
with_items:
|
||||
- {'old': 'matrix_synapse_usage_exporter_docker_image_name_prefix', 'new': 'matrix_synapse_usage_exporter_container_image_registry_prefix'}
|
Reference in New Issue
Block a user