diff --git a/roles/example/tasks/main.yml b/roles/example/tasks/main.yml index 4ce83ac..594fccf 100644 --- a/roles/example/tasks/main.yml +++ b/roles/example/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Hello world container - ansible.builtin.include_role: + ansible.builtin.import_role: name: service vars: service_name: hello-world diff --git a/roles/service/tasks/database.yaml b/roles/service/tasks/database.yaml index 93d8378..4887c13 100644 --- a/roles/service/tasks/database.yaml +++ b/roles/service/tasks/database.yaml @@ -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 diff --git a/roles/service/tasks/proxy.yaml b/roles/service/tasks/proxy.yaml index fa00610..e102bd3 100644 --- a/roles/service/tasks/proxy.yaml +++ b/roles/service/tasks/proxy.yaml @@ -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" diff --git a/roles/service/tasks/secrets.yaml b/roles/service/tasks/secrets.yaml index 8d63537..2db6e59 100644 --- a/roles/service/tasks/secrets.yaml +++ b/roles/service/tasks/secrets.yaml @@ -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 diff --git a/roles/synapse/tasks/main.yaml b/roles/synapse/tasks/main.yaml index d36d300..37bf16f 100644 --- a/roles/synapse/tasks/main.yaml +++ b/roles/synapse/tasks/main.yaml @@ -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: