finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not redefine matrix-postgres role vars in matrix-postgres-backup

Browse Source 
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/868
This commit is contained in:
Slavi Pantaleev
2021-04-05 11:32:19 +03:00
parent 298556e02e
commit 1b55766927
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-postgres-backup/tasks/main.yml
View File

@ -14,4 +14,4 @@
when: run_setup|bool
tags:
- setup-all
- setup-postgres-backup
- setup-postgres-backup

4
roles/matrix-postgres-backup/tasks/setup_postgres_backup.yml
View File

@ -4,14 +4,14 @@
# Tasks related to setting up an internal postgres server
#
- import_tasks: "{{ role_path }}/tasks/util/detect_existing_postgres_version.yml"
when: matrix_postgres_enabled|bool
when: 'matrix_postgres_backup_enabled|bool and matrix_postgres_backup_postgres_data_path != ""'
# If we have found an existing version (installed from before), we use its corresponding Docker image.
# If not, we install using the latest Postgres.
#
# Upgrading is supposed to be performed separately and explicitly (see `upgrade_postgres.yml`).
- set_fact:
matrix_postgres_backup_docker_image_to_use: "{{ matrix_postgres_backup_docker_image_latest if matrix_postgres_backup_detected_version_corresponding_docker_image == '' else matrix_postgres_backup_detected_version_corresponding_docker_image }}"
matrix_postgres_backup_docker_image_to_use: "{{ matrix_postgres_backup_docker_image_latest if matrix_postgres_backup_detected_version_corresponding_docker_image|default('') == '' else matrix_postgres_backup_detected_version_corresponding_docker_image }}"
when: matrix_postgres_backup_enabled|bool
- name: Ensure postgres backup Docker image is pulled