Skip to content

Commit 9f7a369

Browse files
committed
Fix deprecation warnings on Ansible 2.7
and drop Ansible 2.4 support...
1 parent 304cda4 commit 9f7a369

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
env:
2-
- PLATFORM='docker-debian-jessie' ANSIBLE_VERSION='ansible>=2.4,<2.5'
3-
- PLATFORM='docker-debian-stretch' ANSIBLE_VERSION='ansible>=2.4,<2.5'
42
- PLATFORM='docker-debian-jessie' ANSIBLE_VERSION='ansible>=2.5,<2.6'
53
- PLATFORM='docker-debian-stretch' ANSIBLE_VERSION='ansible>=2.5,<2.6'
64
- PLATFORM='docker-debian-jessie' ANSIBLE_VERSION='ansible>=2.6,<2.7'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Supported versions
2929
Requirements
3030
------------
3131

32-
None.
32+
Min Ansible 2.5
3333

3434
Role Variables
3535
--------------

meta/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
galaxy_info:
33
author: Emilien Mantel
4-
description: Normalize and prepare a Debian/Devuan server
4+
description: Normalize and prepare a Debian/Devuan/Kali Linux server
55
company:
66
license: GPLv2
7-
min_ansible_version: 2.4
7+
min_ansible_version: 2.5
88
platforms:
99
- name: Debian
1010
versions:
@@ -14,6 +14,9 @@ galaxy_info:
1414
versions:
1515
- jessie
1616
- ascii
17+
- name: Kali Linux
18+
versions:
19+
- rolling-kali
1720
galaxy_tags:
1821
- networking
1922
- packaging

tasks/apt.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,15 @@
6464

6565
- name: APT | Uninstall packages
6666
apt:
67-
pkg: "{{ item }}"
67+
pkg: "{{ dbs_uninstall_packages }}"
6868
state: absent
69-
with_items: "{{ dbs_uninstall_packages }}"
7069

7170
- name: APT | Install few packages
7271
apt:
73-
pkg: "{{ item }}"
72+
pkg: "{{ lookup('flattened', dbs_packages, dbs_distro_packages) }}"
7473
state: present
7574
update_cache: yes
7675
cache_valid_time: 3600
77-
with_flattened:
78-
- "{{ dbs_packages }}"
79-
- "{{ dbs_distro_packages }}"
8076

8177
- name: APT | Install Intel Microcode if needed
8278
apt:

tasks/nosystemd.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
- name: APT | Install sysvinit
44
apt:
5-
pkg: "{{ item }}"
5+
pkg: "{{ dbs_sysvinit_packages }}"
66
state: present
7-
with_items: "{{ dbs_sysvinit_packages }}"
87
register: sysv_installed
98

109
- block:

tasks/timezone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
dbs_timezone_legacy_mode: true
66
when: >
77
ansible_distribution == 'Debian' and
8-
ansible_distribution_major_version | version_compare(9, 'ge')
8+
ansible_distribution_major_version is version_compare(9, 'ge')
99
1010
- name: TIMEZONE | Set
1111
timezone:

0 commit comments

Comments
 (0)