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:
@ -24,11 +24,12 @@ matrix_rageshake_config_path: "{{ matrix_rageshake_base_path }}/config"
|
||||
matrix_rageshake_data_path: "{{ matrix_rageshake_base_path }}/data"
|
||||
matrix_rageshake_container_src_files_path: "{{ matrix_rageshake_base_path }}/container-src"
|
||||
|
||||
matrix_rageshake_container_image: "{{ matrix_rageshake_container_image_name_prefix }}matrix-org/rageshake:{{ matrix_rageshake_container_image_tag }}"
|
||||
matrix_rageshake_container_image_name_prefix: "{{ 'localhost/' if matrix_rageshake_container_image_self_build else matrix_rageshake_container_registry_prefix }}"
|
||||
matrix_rageshake_container_image: "{{ matrix_rageshake_container_image_registry_prefix }}matrix-org/rageshake:{{ matrix_rageshake_container_image_tag }}"
|
||||
matrix_rageshake_container_image_registry_prefix: "{{ 'localhost/' if matrix_rageshake_container_image_self_build else matrix_rageshake_container_image_registry_prefix_upstream }}"
|
||||
matrix_rageshake_container_image_registry_prefix_upstream: "{{ matrix_rageshake_container_image_registry_prefix_upstream_default }}"
|
||||
matrix_rageshake_container_image_registry_prefix_upstream_default: "ghcr.io/"
|
||||
matrix_rageshake_container_image_force_pull: "{{ matrix_rageshake_container_image.endswith(':master') }}"
|
||||
matrix_rageshake_container_image_tag: "{{ matrix_rageshake_version }}"
|
||||
matrix_rageshake_container_registry_prefix: ghcr.io/
|
||||
|
||||
matrix_rageshake_container_image_self_build: false
|
||||
matrix_rageshake_container_image_self_build_repo: "https://github.com/matrix-org/rageshake/"
|
||||
|
@ -10,6 +10,14 @@
|
||||
- matrix_rageshake_path_prefix
|
||||
- matrix_rageshake_container_network
|
||||
|
||||
- name: (Deprecation) Catch and report renamed rageshake variables
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
|
||||
when: "item.old in vars"
|
||||
with_items:
|
||||
- {'old': 'matrix_rageshake_docker_image_name_prefix', 'new': 'matrix_rageshake_docker_image_registry_prefix'}
|
||||
|
||||
- when: matrix_rageshake_container_labels_traefik_enabled | bool
|
||||
block:
|
||||
- name: Fail if required rageshake Traefik settings not defined
|
||||
|
Reference in New Issue
Block a user