mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-07 03:07:33 +01:00
7330992b20
Fedora 35 is: - `ansible_os_family = 'RedHat'` - `ansible_distribution_major_version = '35'` Our RedHat checks against v7/v8 are really for RHEL derivatives (CentOS, Rockylinux, AlmaLinux), but the same checks (by coincidence) apply for Fedora 35. The problem is that `'35' > '7'` (comparing these as strings) is `false`. This patch makes sure that we always cast `ansible_distribution_major_version` to an integer. Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1610
44 lines
1.4 KiB
YAML
44 lines
1.4 KiB
YAML
---
|
|
|
|
- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat.yml"
|
|
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 8
|
|
|
|
- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
|
|
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7
|
|
|
|
- block:
|
|
# ansible_lsb is only available if lsb-release is installed.
|
|
- name: Ensure lsb-release installed
|
|
apt:
|
|
name:
|
|
- lsb-release
|
|
state: present
|
|
update_cache: true
|
|
register: lsb_release_installation_result
|
|
|
|
- name: Reread ansible_lsb facts if lsb-release got installed
|
|
setup: filter=ansible_lsb*
|
|
when: lsb_release_installation_result.changed
|
|
|
|
- include_tasks: "{{ role_path }}/tasks/server_base/setup_debian.yml"
|
|
when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian')
|
|
|
|
- include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
|
|
when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian')
|
|
when: ansible_os_family == 'Debian'
|
|
|
|
- include_tasks: "{{ role_path }}/tasks/server_base/setup_archlinux.yml"
|
|
when: ansible_distribution == 'Archlinux'
|
|
|
|
- name: Ensure Docker is started and autoruns
|
|
service:
|
|
name: docker
|
|
state: started
|
|
enabled: true
|
|
|
|
- name: "Ensure {{ matrix_ntpd_service }} is started and autoruns"
|
|
service:
|
|
name: "{{ matrix_ntpd_service }}"
|
|
state: started
|
|
enabled: true
|