Use import_role where possible
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
---
|
||||
- name: Hello world container
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: service
|
||||
vars:
|
||||
service_name: hello-world
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
file: database.yaml
|
||||
|
||||
- name: Database container for {{ service_name }}
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: container
|
||||
vars:
|
||||
container_name: "{{ service_name }}-{{ service_database_type }}" # This doesn't use _service_database_name to allow container role handlers to work
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
notify: Restart socat socket for {{ service_name }}
|
||||
|
||||
- name: Socat container for {{ service_name }}
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: container
|
||||
vars:
|
||||
container_name: "{{ service_name }}-socat"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
- name: Create secrets
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: container
|
||||
tasks_from: secrets.yaml
|
||||
rolespec_validate: false # FIXME make proper validation possible
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
quiet: true
|
||||
|
||||
- name: Synapse container
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: service
|
||||
vars:
|
||||
service_name: synapse
|
||||
@@ -59,7 +59,7 @@
|
||||
- matrix-authentication-service.service
|
||||
|
||||
- name: Matrix authentication service for synapse
|
||||
ansible.builtin.include_role:
|
||||
ansible.builtin.import_role:
|
||||
name: matrix_authentication_service
|
||||
vars:
|
||||
matrix_authentication_service_additional_networks:
|
||||
|
||||
Reference in New Issue
Block a user