Browse Source

Make ansible-lint happy

pull/3641/head
Slavi Pantaleev 1 year ago
parent
commit
7139431d46
4 changed files with 9 additions and 8 deletions
  1. +0
    -1
      roles/custom/matrix-authentication-service/defaults/main.yml
  2. +2
    -2
      roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml
  3. +5
    -5
      roles/custom/matrix-authentication-service/tasks/syn2mas.yml
  4. +2
    -0
      roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml

+ 0
- 1
roles/custom/matrix-authentication-service/defaults/main.yml View File

@@ -593,4 +593,3 @@ matrix_authentication_service_migration_in_progress: false
# /Misc # # /Misc #
# # # #
######################################################################################## ########################################################################################


+ 2
- 2
roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml View File

@@ -7,8 +7,8 @@
daemon_reload: true daemon_reload: true
register: matrix_authentication_service_mas_ensure_started_result register: matrix_authentication_service_mas_ensure_started_result


- when: matrix_authentication_service_mas_ensure_started_result.changed | bool
name: Wait a bit, so that Matrix Authentication Service can start
- name: Wait a bit, so that Matrix Authentication Service can start
when: matrix_authentication_service_mas_ensure_started_result.changed | bool
ansible.builtin.wait_for: ansible.builtin.wait_for:
timeout: "{{ matrix_authentication_service_syn2mas_start_wait_time_seconds }}" timeout: "{{ matrix_authentication_service_syn2mas_start_wait_time_seconds }}"
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1


+ 5
- 5
roles/custom/matrix-authentication-service/tasks/syn2mas.yml View File

@@ -1,6 +1,6 @@
--- ---


- set_fact:
- ansible.builtin.set_fact:
matrix_authentication_service_syn2mas_dry_run: "{{ matrix_authentication_service_syn2mas_dry_run | bool }}" matrix_authentication_service_syn2mas_dry_run: "{{ matrix_authentication_service_syn2mas_dry_run | bool }}"


- name: Abort, if not using Synapse - name: Abort, if not using Synapse
@@ -124,14 +124,14 @@
ansible.builtin.debug: ansible.builtin.debug:
var: matrix_authentication_service_syn2mas_migration_command_result var: matrix_authentication_service_syn2mas_migration_command_result


- when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_synapse_ensure_stopped_result.changed"
name: Ensure Synapse is started (if it previously was)
- name: Ensure Synapse is started (if it previously was)
when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_synapse_ensure_stopped_result.changed"
ansible.builtin.service: ansible.builtin.service:
name: matrix-synapse name: matrix-synapse
state: started state: started


- when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"
name: Ensure Matrix Authentication Service is started (if it previously was)
- name: Ensure Matrix Authentication Service is started (if it previously was)
when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"
ansible.builtin.service: ansible.builtin.service:
name: matrix-authentication-service name: matrix-authentication-service
state: started state: started

+ 2
- 0
roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml View File

@@ -1,3 +1,5 @@
---

- name: Prepare Matrix Authentication Service private key file path ({{ private_key_definition.key_file }}) - name: Prepare Matrix Authentication Service private key file path ({{ private_key_definition.key_file }})
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_authentication_service_private_key_file_path: "{{ matrix_authentication_service_data_keys_path }}/{{ private_key_definition.key_file }}" matrix_authentication_service_private_key_file_path: "{{ matrix_authentication_service_data_keys_path }}/{{ private_key_definition.key_file }}"


Loading…
Cancel
Save