Skip to content

Commit c99dfad

Browse files
authored
remove support for end-of-life rhel6 and ubuntu < 20.04, fix version compare (#187)
* remove support for end-of-life rhel6 and ubuntu < 20.04 * fix version compare
1 parent 1d1de00 commit c99dfad

File tree

4 files changed

+3
-27
lines changed

4 files changed

+3
-27
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ with the following specific software versions:
2626
* CentOS: 7
2727
* Debian: 8
2828
* RHEL: 7
29-
* Ubuntu: 16.04
29+
* Ubuntu: >= 20.04
3030
* unzip for [unarchive module](https://docs.ansible.com/ansible/latest/modules/unarchive_module.html#notes)
3131

3232
## Role Variables

defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ os_supported_matrix:
99
min_version: ""
1010
# RHEL-based
1111
RedHat:
12-
min_version: "6"
12+
min_version: "7"
1313
CentOS:
1414
min_version: "7"
1515
Fedora:

tasks/asserts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
quiet: true
3232
fail_msg: "{{ ansible_distribution_version }} is not supported for this role"
3333
that:
34-
- ansible_distribution_version is version(version_to_compare, '>')
34+
- ansible_distribution_version is version(version_to_compare, '>=')
3535
when:
3636
- version_to_compare is defined
3737
- version_to_compare | length > 0

tasks/docker.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
---
2-
# File: docker.yml - Docker tasks for nomad
3-
4-
## Docker items
5-
6-
# Fix for https://github.com/docker/docker/issues/23347
7-
- name: Install dmsetup for Ubuntu 16.04
8-
ansible.builtin.apt:
9-
pkg: dmsetup
10-
state: present
11-
update_cache: true
12-
cache_valid_time: 600
13-
register: dmsetup_result
14-
when:
15-
- ansible_os_family == "Debian"
16-
- ansible_distribution_version is version_compare(16.04, '=')
17-
- nomad_docker_dmsetup | bool
18-
19-
- name: Run dmsetup for Ubuntu 16.04 # noqa no-changed-when
20-
ansible.builtin.command:
21-
cmd: dmsetup mknodes
22-
when:
23-
- nomad_docker_dmsetup | bool
24-
- dmsetup_result
25-
262
- name: Add Nomad user to docker group
273
ansible.builtin.user:
284
name: "{{ nomad_user }}"

0 commit comments

Comments
 (0)