all-roles: Dot not use ansible_lsb as it is deprecated
continuous-integration/drone/push Build encountered an error Details
continuous-integration/drone/pr Build is passing Details

We move from `ansible_lsb.codename` to `ansible_distribution_release`.
This commit is contained in:
Benoît S. 2019-07-03 09:41:35 +02:00
parent 0b8681cf59
commit 771c75c1de
33 changed files with 49 additions and 49 deletions

View File

@ -27,7 +27,7 @@
tags:
- apache
- packages
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: basic modules are enabled
apache2_module:

View File

@ -9,7 +9,7 @@
- name: Backports sources list is installed
template:
src: '{{ ansible_lsb.codename }}_backports.list.j2'
src: '{{ ansible_distribution_release }}_backports.list.j2'
dest: /etc/apt/sources.list.d/backports.list
force: yes
mode: "0640"
@ -19,7 +19,7 @@
- name: Backports configuration
copy:
src: '{{ ansible_lsb.codename }}_backports_preferences'
src: '{{ ansible_distribution_release }}_backports_preferences'
dest: /etc/apt/preferences.d/0-backports-defaults
force: yes
mode: "0640"
@ -33,7 +33,7 @@
line: 'Acquire::Check-Valid-Until no;'
create: yes
state: present
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
tags:
- apt

View File

@ -2,7 +2,7 @@
- name: Change basics repositories
template:
src: "{{ ansible_lsb.codename }}_basics.list.j2"
src: "{{ ansible_distribution_release }}_basics.list.j2"
dest: /etc/apt/sources.list
mode: "0644"
force: yes

View File

@ -3,7 +3,7 @@
# - name: Fail if distribution is not supported
# fail:
# msg: "Error: Evolix public repository is not compatble with 'Debian Stretch' yet."
# when: ansible_lsb.codename == "stretch"
# when: ansible_distribution_release == "stretch"
# tags:
# - apt

View File

@ -1,4 +1,4 @@
# {{ ansible_managed }}
# deb http://pub.evolix.net/ {{ ansible_lsb.codename }}/
# deb http://pub.evolix.net/ {{ ansible_distribution_release }}/
deb http://pub.evolix.net/ stretch/

View File

@ -47,7 +47,7 @@
notify:
- reload systemd
- restart bind
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: touch /var/log/bind.log if non chroot
file:

View File

@ -21,13 +21,13 @@
- name: Add Docker repository
apt_repository:
repo: 'deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_lsb.codename }} stable'
repo: 'deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable'
state: present
update_cache: no
filename: docker.list
- include: jessie_backports.yml
when: ansible_lsb.codename == 'jessie'
when: ansible_distribution_release == 'jessie'
- name: Add Docker's official GPG key
apt_key:

View File

@ -2,7 +2,7 @@
- name: Use the correct debian repository
set_fact:
curator_debian_repository: '{% if ansible_lsb.codename == "jessie" %}debian{% else %}debian9{% endif %}'
curator_debian_repository: '{% if ansible_distribution_release == "jessie" %}debian{% else %}debian9{% endif %}'
- name: Curator sources list is available
apt_repository:

View File

@ -13,7 +13,7 @@
notify: apt update
- meta: flush_handlers
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: Install certbot with apt
apt:

View File

@ -57,13 +57,13 @@
apt_key:
# url: https://hwraid.le-vert.net/debian/hwraid.le-vert.net.gpg.key
data: "{{ lookup('file', 'hwraid.le-vert.net.gpg.key') }}"
when: ansible_lsb.codename == "stretch"
when: ansible_distribution_release == "stretch"
- name: Add HW tool repository
apt_repository:
repo: 'deb http://hwraid.le-vert.net/debian stretch main'
state: present
when: ansible_lsb.codename == "stretch"
when: ansible_distribution_release == "stretch"
- name: Install packages for DELL/LSI hardware
apt:

View File

@ -134,7 +134,7 @@
when:
- evolinux_packages_listchanges
- ansible_distribution == "Debian"
- ansible_lsb.codename == "jessie"
- ansible_distribution_release == "jessie"
- name: apt-listchanges is absent on Stretch and later
apt:

View File

@ -125,7 +125,7 @@
mode: "0755"
when:
- evolinux_system_alert5_init
- ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch"
- ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch"
- name: Enable alert5 init script (jessie/stretch)
service:
@ -134,7 +134,7 @@
when:
- evolinux_system_alert5_init
- evolinux_system_alert5_enable
- ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch"
- ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch"

View File

@ -1,7 +1,7 @@
---
- include: sudo_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: sudo_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')

View File

@ -10,7 +10,7 @@
- name: Fluentd sources list is available
apt_repository:
repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_lsb.codename }}/ {{ ansible_lsb.codename }} contrib"
repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} contrib"
filename: treasuredata
update_cache: yes
state: present

View File

@ -1,3 +1,3 @@
Package: haproxy libssl1.0.0
Pin: release a={{ ansible_lsb.codename }}-backports
Pin: release a={{ ansible_distribution_release }}-backports
Pin-Priority: 999

View File

@ -1,7 +1,7 @@
---
- name: Decide which Debian release to use
set_fact:
java_apt_release: '{% if ansible_lsb.codename == "jessie" %}jessie-backports{% else %}{{ ansible_lsb.codename }}{% endif %}'
java_apt_release: '{% if ansible_distribution_release == "jessie" %}jessie-backports{% else %}{{ ansible_distribution_release }}{% endif %}'
tags:
- java
@ -9,7 +9,7 @@
include_role:
name: apt
tasks_from: backports.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
tags:
- java

View File

@ -3,10 +3,10 @@
# - fail:
# msg: only compatible with Debian 8
# when:
# - ansible_distribution != "Debian" or ansible_lsb.codename != "jessie"
# - ansible_distribution != "Debian" or ansible_distribution_release != "jessie"
- include: main_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: main_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')

View File

@ -22,7 +22,7 @@
- packages
- mytop
- mysql
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
# - name: "mysql-utilities are installed (Debian 9 or later)"
# apt:

View File

@ -7,19 +7,19 @@
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: packages_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: users_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: users_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: config_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: config_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: datadir.yml

View File

@ -22,7 +22,7 @@
- packages
- mytop
- mysql
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Install depends for mytop (stretch)"
apt:
@ -31,7 +31,7 @@
- mariadb-client-10.1
- libconfig-inifiles-perl
- libterm-readkey-perl
when: ansible_lsb.codename == "stretch"
when: ansible_distribution_release == "stretch"
- name: "Install depends for mytop (Debian 10 or later)"
apt:

View File

@ -1,3 +1,3 @@
Package: nginx nginx-* libnginx-* libssl*
Pin: release a={{ ansible_lsb.codename }}-backports
Pin: release a={{ ansible_distribution_release }}-backports
Pin-Priority: 999

View File

@ -19,7 +19,7 @@
- name: NodeJS sources list ({{ nodejs_apt_version }}) is available
apt_repository:
repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_lsb.codename }} main"
repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_distribution_release }} main"
filename: nodesource
update_cache: yes
state: present

View File

@ -48,7 +48,7 @@
src: userlogrotate_jessie
dest: /etc/cron.weekly/userlogrotate
mode: "0755"
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Install userlogrotate (Debian 9 or later)"
copy:

View File

@ -1,7 +1,7 @@
---
- set_fact:
percona__apt_config_package_file: "percona-release_latest.{{ ansible_lsb.codename }}_all.deb"
percona__apt_config_package_file: "percona-release_latest.{{ ansible_distribution_release }}_all.deb"
- name: Add Percona's official GPG key
apt_key:

View File

@ -6,10 +6,10 @@
- ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
- include: main_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: main_stretch.yml
when: ansible_lsb.codename == "stretch"
when: ansible_distribution_release == "stretch"
- include: main_buster.yml
when: ansible_distribution_major_version | version_compare('9', '>=')

View File

@ -1,7 +1,7 @@
---
- include: packages_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: packages_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')

View File

@ -10,7 +10,7 @@
- name: Add PGDG repository
apt_repository:
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_lsb.codename}}-pgdg main"
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
update_cache: yes
- name: Add GPG key for PGDG repository

View File

@ -1,3 +1,3 @@
Package: postgresql-{{postgresql_version}} postgresql-client-common postgresql-common libpq5 ptop
Pin: release a={{ansible_lsb.codename}}-pgdg
Pin: release a={{ansible_distribution_release}}-pgdg
Pin-Priority: 999

View File

@ -93,7 +93,7 @@
- nrpe
- include: nrpe_stretch.yml
when: ansible_lsb.codename == "stretch" and nrpe_evolix_config.stat.exists == true
when: ansible_distribution_release == "stretch" and nrpe_evolix_config.stat.exists == true
tags:
- redis
- nrpe

View File

@ -8,7 +8,7 @@
- name: "Set squid name (jessie)"
set_fact:
squid_daemon_name: squid3
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Set squid name (Debian 9 or later)"
set_fact:
@ -34,7 +34,7 @@
src: squid.conf.j2
dest: /etc/squid3/squid.conf
notify: "restart squid3"
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "evolix whitelist is present (jessie)"
copy:
@ -42,7 +42,7 @@
dest: /etc/squid3/whitelist.conf
force: no
notify: "reload squid3"
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "evolinux defaults squid file (Debian 9 or later)"
copy:
@ -135,7 +135,7 @@
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: logrotate_jessie.yml
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- include: logrotate_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')

View File

@ -19,7 +19,7 @@
with_items:
- php-pear
- php-log
when: ansible_lsb.codename == "stretch"
when: ansible_distribution_release == "stretch"
- name: Install PHP5 packages (jessie)
apt:
@ -28,4 +28,4 @@
allow_unauthenticated: yes
with_items:
- php5-pam
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"

View File

@ -17,7 +17,7 @@
name: www-evoadmin
groups: shadow
append: yes
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Create www-evoadmin (Debian 9 or later)"
user:
@ -52,7 +52,7 @@
dest: "{{ evoadmin_document_root }}"
version: jessie
update: no
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Clone evoadmin repository (Debian 9 or later)"
git:

View File

@ -7,7 +7,7 @@
option: "disable_functions"
value: "shell-exec,system,passthru,putenv,popen"
notify: reload apache2
when: ansible_lsb.codename == "jessie"
when: ansible_distribution_release == "jessie"
- name: "Set custom values for PHP config (Debian 9 or later)"
ini_file: