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

fix: manually merge upstream

Browse Source
This commit is contained in:
Marko Weltzer
2022-02-09 09:01:56 +01:00
parent 8e8bf55e15 5163aa643a
commit d27e623c71
10 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/matrix-base/tasks/server_base/setup.yml
View File

@@ -1,10 +1,10 @@
---
- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos.yml"
when: ansible_distribution == 'CentOS' and ansible_distribution_major_version < '8'
- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat.yml"
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '8'
- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos8.yml"
when: ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7'
- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7'
- block:
# ansible_lsb is only available if lsb-release is installed.

0
roles/matrix-base/tasks/server_base/setup_centos.yml → roles/matrix-base/tasks/server_base/setup_redhat.yml
View File

0
roles/matrix-base/tasks/server_base/setup_centos8.yml → roles/matrix-base/tasks/server_base/setup_redhat8.yml
View File