Просмотр исходного кода

Make ansible check mode runs silent, for all tasks which can't be idempotent

pull/610/head
Benjamin Fichtner 5 лет назад
Родитель
Сommit
a449d008fb
4 измененных файлов: 11 добавлений и 3 удалений
  1. +5
    -3
      roles/matrix-common-after/tasks/start.yml
  2. +1
    -0
      roles/matrix-common-after/tasks/stop.yml
  3. +3
    -0
      roles/matrix-dimension/tasks/setup_dimension.yml
  4. +2
    -0
      roles/matrix-nginx-proxy/tasks/ssl/main.yml

+ 5
- 3
roles/matrix-common-after/tasks/start.yml Просмотреть файл

@@ -1,21 +1,23 @@
--- ---


- name: Ensure systemd reloaded
- name: Ensure systemd is reloaded
service: service:
daemon_reload: yes daemon_reload: yes


- name: Ensure Matrix services stopped
- name: Ensure Matrix services are stopped
service: service:
name: "{{ item }}" name: "{{ item }}"
state: stopped state: stopped
with_items: "{{ matrix_systemd_services_list }}" with_items: "{{ matrix_systemd_services_list }}"
when: not ansible_check_mode


- name: Ensure Matrix services started
- name: Ensure Matrix services are started
service: service:
name: "{{ item }}" name: "{{ item }}"
enabled: yes enabled: yes
state: started state: started
with_items: "{{ matrix_systemd_services_list }}" with_items: "{{ matrix_systemd_services_list }}"
when: not ansible_check_mode


# If we check service state immediately, we may succeed, # If we check service state immediately, we may succeed,
# because it takes some time for the service to attempt to start and actually fail. # because it takes some time for the service to attempt to start and actually fail.


+ 1
- 0
roles/matrix-common-after/tasks/stop.yml Просмотреть файл

@@ -5,3 +5,4 @@
name: "{{ item }}" name: "{{ item }}"
state: stopped state: stopped
with_items: "{{ matrix_systemd_services_list }}" with_items: "{{ matrix_systemd_services_list }}"
when: not ansible_check_mode

+ 3
- 0
roles/matrix-dimension/tasks/setup_dimension.yml Просмотреть файл

@@ -22,12 +22,15 @@
group: "{{ matrix_dimension_user_gid }}" group: "{{ matrix_dimension_user_gid }}"
when: matrix_dimension_enabled|bool when: matrix_dimension_enabled|bool


# This task will be always change due to default image :latest
# to ensure idempotence, this changed_when is set to false
- name: Ensure Dimension image is pulled - name: Ensure Dimension image is pulled
docker_image: docker_image:
name: "{{ matrix_dimension_docker_image }}" name: "{{ matrix_dimension_docker_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_dimension_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force_source: "{{ matrix_dimension_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_dimension_docker_image_force_pull }}" force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_dimension_docker_image_force_pull }}"
changed_when: False
when: matrix_dimension_enabled|bool when: matrix_dimension_enabled|bool


- name: Ensure matrix-dimension.service installed - name: Ensure matrix-dimension.service installed


+ 2
- 0
roles/matrix-nginx-proxy/tasks/ssl/main.yml Просмотреть файл

@@ -8,6 +8,7 @@


# Common tasks, required by almost any method below. # Common tasks, required by almost any method below.


# The recurse option of this task will always return a change, which should be ignored
- name: Ensure SSL certificate paths exists - name: Ensure SSL certificate paths exists
file: file:
path: "{{ item }}" path: "{{ item }}"
@@ -16,6 +17,7 @@
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"
recurse: true recurse: true
changed_when: False
with_items: with_items:
- "{{ matrix_ssl_log_dir_path }}" - "{{ matrix_ssl_log_dir_path }}"
- "{{ matrix_ssl_config_dir_path }}" - "{{ matrix_ssl_config_dir_path }}"


Загрузка…
Отмена
Сохранить