From bee57a0b3c23a9d122397d6d5f549d7f374c68a8 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 18 Jun 2019 17:35:28 +0200 Subject: [PATCH] change distribution release codename Ansible 2.2 is too old to know about buster. Let's use LSB for that. --- apache/tasks/main.yml | 2 +- apt/tasks/backports.yml | 6 +++--- apt/tasks/basics.yml | 2 +- apt/tasks/evolix_public.yml | 2 +- apt/templates/evolix_public.list.j2 | 2 +- bind/tasks/main.yml | 2 +- elasticsearch/tasks/curator.yml | 2 +- evoacme/tasks/certbot.yml | 2 +- evolinux-base/tasks/hardware.yml | 4 ++-- evolinux-base/tasks/packages.yml | 2 +- evolinux-base/tasks/system.yml | 4 ++-- evolinux-users/tasks/sudo.yml | 2 +- fluentd/tasks/main.yml | 2 +- haproxy/templates/haproxy_apt_preferences.j2 | 2 +- java/tasks/openjdk.yml | 4 ++-- mongodb/tasks/main.yml | 4 ++-- mysql-oracle/tasks/utils.yml | 2 +- mysql/tasks/main.yml | 6 +++--- mysql/tasks/utils.yml | 2 +- nginx/templates/apt/nginx_preferences | 2 +- nodejs/tasks/main.yml | 2 +- packweb-apache/tasks/main.yml | 2 +- percona/tasks/main.yml | 2 +- php/tasks/main.yml | 2 +- postgresql/tasks/main.yml | 2 +- postgresql/tasks/pgdg-repo.yml | 2 +- postgresql/templates/postgresql.pref.j2 | 2 +- redis/tasks/main.yml | 2 +- squid/tasks/main.yml | 8 ++++---- webapps/evoadmin-web/tasks/packages.yml | 2 +- webapps/evoadmin-web/tasks/user.yml | 4 ++-- webapps/evoadmin-web/tasks/web.yml | 2 +- 32 files changed, 44 insertions(+), 44 deletions(-) diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index a461a8d4..d73f93b2 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -27,7 +27,7 @@ tags: - apache - packages - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: basic modules are enabled apache2_module: diff --git a/apt/tasks/backports.yml b/apt/tasks/backports.yml index 6acf8114..02e189a3 100644 --- a/apt/tasks/backports.yml +++ b/apt/tasks/backports.yml @@ -9,7 +9,7 @@ - name: Backports sources list is installed template: - src: '{{ ansible_distribution_release }}_backports.list.j2' + src: '{{ ansible_lsb.codename }}_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_distribution_release }}_backports_preferences' + src: '{{ ansible_lsb.codename }}_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_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: Apt update apt: diff --git a/apt/tasks/basics.yml b/apt/tasks/basics.yml index f615c030..edd3ea0c 100644 --- a/apt/tasks/basics.yml +++ b/apt/tasks/basics.yml @@ -2,7 +2,7 @@ - name: Change basics repositories template: - src: "{{ ansible_distribution_release }}_basics.list.j2" + src: "{{ ansible_lsb.codename }}_basics.list.j2" dest: /etc/apt/sources.list mode: "0644" force: yes diff --git a/apt/tasks/evolix_public.yml b/apt/tasks/evolix_public.yml index b1db38ab..ba0a0da6 100644 --- a/apt/tasks/evolix_public.yml +++ b/apt/tasks/evolix_public.yml @@ -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_distribution_release == "stretch" +# when: ansible_lsb.codename == "stretch" # tags: # - apt diff --git a/apt/templates/evolix_public.list.j2 b/apt/templates/evolix_public.list.j2 index 06de99c0..483d4707 100644 --- a/apt/templates/evolix_public.list.j2 +++ b/apt/templates/evolix_public.list.j2 @@ -1,3 +1,3 @@ # {{ ansible_managed }} -deb http://pub.evolix.net/ {{ ansible_distribution_release }}/ +deb http://pub.evolix.net/ {{ ansible_lsb.codename }}/ diff --git a/bind/tasks/main.yml b/bind/tasks/main.yml index 8fdf1692..9dadc3fb 100644 --- a/bind/tasks/main.yml +++ b/bind/tasks/main.yml @@ -47,7 +47,7 @@ notify: - reload systemd - restart bind - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: touch /var/log/bind.log if non chroot file: diff --git a/elasticsearch/tasks/curator.yml b/elasticsearch/tasks/curator.yml index c7c44259..5b6fdfc8 100644 --- a/elasticsearch/tasks/curator.yml +++ b/elasticsearch/tasks/curator.yml @@ -2,7 +2,7 @@ - name: Use the correct debian repository set_fact: - curator_debian_repository: '{% if ansible_distribution_release == "jessie" %}debian{% else %}debian9{% endif %}' + curator_debian_repository: '{% if ansible_lsb.codename == "jessie" %}debian{% else %}debian9{% endif %}' - name: Curator sources list is available apt_repository: diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml index 003c92d0..71825d64 100644 --- a/evoacme/tasks/certbot.yml +++ b/evoacme/tasks/certbot.yml @@ -13,7 +13,7 @@ notify: apt update - meta: flush_handlers - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: Install certbot with apt apt: diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 8607a586..cc7e85e5 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -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_distribution_release == "stretch" + when: ansible_lsb.codename == "stretch" - name: Add HW tool repository apt_repository: repo: 'deb http://hwraid.le-vert.net/debian stretch main' state: present - when: ansible_distribution_release == "stretch" + when: ansible_lsb.codename == "stretch" - name: Install packages for DELL/LSI hardware apt: diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml index aab2f6da..f24aaef9 100644 --- a/evolinux-base/tasks/packages.yml +++ b/evolinux-base/tasks/packages.yml @@ -126,7 +126,7 @@ when: - evolinux_packages_listchanges - ansible_distribution == "Debian" - - ansible_distribution_release == "jessie" + - ansible_lsb.codename == "jessie" - name: apt-listchanges is absent on Stretch and later apt: diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index 4ef08fa3..502df7e9 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -125,7 +125,7 @@ mode: "0755" when: - evolinux_system_alert5_init - - ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch" + - ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch" - name: Enable alert5 init script (jessie/stretch) service: @@ -134,7 +134,7 @@ when: - evolinux_system_alert5_init - evolinux_system_alert5_enable - - ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch" + - ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch" diff --git a/evolinux-users/tasks/sudo.yml b/evolinux-users/tasks/sudo.yml index ed696b43..a4b28d25 100644 --- a/evolinux-users/tasks/sudo.yml +++ b/evolinux-users/tasks/sudo.yml @@ -1,7 +1,7 @@ --- - include: sudo_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: sudo_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') diff --git a/fluentd/tasks/main.yml b/fluentd/tasks/main.yml index 118b78b0..cad4f17e 100644 --- a/fluentd/tasks/main.yml +++ b/fluentd/tasks/main.yml @@ -9,7 +9,7 @@ - name: Fluentd sources list is available apt_repository: - repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} contrib" + repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_lsb.codename }}/ {{ ansible_lsb.codename }} contrib" filename: treasuredata update_cache: yes state: present diff --git a/haproxy/templates/haproxy_apt_preferences.j2 b/haproxy/templates/haproxy_apt_preferences.j2 index 706ee67d..144f1bc2 100644 --- a/haproxy/templates/haproxy_apt_preferences.j2 +++ b/haproxy/templates/haproxy_apt_preferences.j2 @@ -1,3 +1,3 @@ Package: haproxy libssl1.0.0 -Pin: release a={{ ansible_distribution_release }}-backports +Pin: release a={{ ansible_lsb.codename }}-backports Pin-Priority: 999 diff --git a/java/tasks/openjdk.yml b/java/tasks/openjdk.yml index 9b4f0b7d..20e1f04c 100644 --- a/java/tasks/openjdk.yml +++ b/java/tasks/openjdk.yml @@ -1,7 +1,7 @@ --- - name: Decide which Debian release to use set_fact: - java_apt_release: '{% if ansible_distribution_release == "jessie" %}jessie-backports{% else %}{{ ansible_distribution_release }}{% endif %}' + java_apt_release: '{% if ansible_lsb.codename == "jessie" %}jessie-backports{% else %}{{ ansible_lsb.codename }}{% endif %}' tags: - java @@ -9,7 +9,7 @@ include_role: name: apt tasks_from: backports.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" tags: - java diff --git a/mongodb/tasks/main.yml b/mongodb/tasks/main.yml index a13183c6..e97ed3a8 100644 --- a/mongodb/tasks/main.yml +++ b/mongodb/tasks/main.yml @@ -3,10 +3,10 @@ # - fail: # msg: only compatible with Debian 8 # when: -# - ansible_distribution != "Debian" or ansible_distribution_release != "jessie" +# - ansible_distribution != "Debian" or ansible_lsb.codename != "jessie" - include: main_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: main_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml index 79587f16..cc2c6233 100644 --- a/mysql-oracle/tasks/utils.yml +++ b/mysql-oracle/tasks/utils.yml @@ -22,7 +22,7 @@ - packages - mytop - mysql - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" # - name: "mysql-utilities are installed (Debian 9 or later)" # apt: diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml index 8e14c8de..ff47c6ac 100644 --- a/mysql/tasks/main.yml +++ b/mysql/tasks/main.yml @@ -7,19 +7,19 @@ when: ansible_distribution_major_version | version_compare('9', '>=') - include: packages_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: users_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') - include: users_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: config_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') - include: config_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: datadir.yml diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml index 390acc0e..74ebceef 100644 --- a/mysql/tasks/utils.yml +++ b/mysql/tasks/utils.yml @@ -22,7 +22,7 @@ - packages - mytop - mysql - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "Install depends for mytop (Debian 9 or later)" apt: diff --git a/nginx/templates/apt/nginx_preferences b/nginx/templates/apt/nginx_preferences index 84bf65ff..c0fb042a 100644 --- a/nginx/templates/apt/nginx_preferences +++ b/nginx/templates/apt/nginx_preferences @@ -1,3 +1,3 @@ Package: nginx nginx-* libnginx-* libssl* -Pin: release a={{ ansible_distribution_release }}-backports +Pin: release a={{ ansible_lsb.codename }}-backports Pin-Priority: 999 diff --git a/nodejs/tasks/main.yml b/nodejs/tasks/main.yml index bad66d95..d0754d52 100644 --- a/nodejs/tasks/main.yml +++ b/nodejs/tasks/main.yml @@ -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_distribution_release }} main" + repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_lsb.codename }} main" filename: nodesource update_cache: yes state: present diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index f5d0f35e..71e479d6 100644 --- a/packweb-apache/tasks/main.yml +++ b/packweb-apache/tasks/main.yml @@ -48,7 +48,7 @@ src: userlogrotate_jessie dest: /etc/cron.weekly/userlogrotate mode: "0755" - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "Install userlogrotate (Debian 9 or later)" copy: diff --git a/percona/tasks/main.yml b/percona/tasks/main.yml index cce78c3a..701bba47 100644 --- a/percona/tasks/main.yml +++ b/percona/tasks/main.yml @@ -1,7 +1,7 @@ --- - set_fact: - percona__apt_config_package_file: "percona-release_latest.{{ ansible_distribution_release }}_all.deb" + percona__apt_config_package_file: "percona-release_latest.{{ ansible_lsb.codename }}_all.deb" - name: Add Percona's official GPG key apt_key: diff --git a/php/tasks/main.yml b/php/tasks/main.yml index 38ece76b..6e45babf 100644 --- a/php/tasks/main.yml +++ b/php/tasks/main.yml @@ -6,7 +6,7 @@ - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - include: main_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: main_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') diff --git a/postgresql/tasks/main.yml b/postgresql/tasks/main.yml index 3bc1f904..17917abe 100644 --- a/postgresql/tasks/main.yml +++ b/postgresql/tasks/main.yml @@ -1,7 +1,7 @@ --- - include: packages_jessie.yml - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: packages_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') diff --git a/postgresql/tasks/pgdg-repo.yml b/postgresql/tasks/pgdg-repo.yml index dcc63d6f..4019aded 100644 --- a/postgresql/tasks/pgdg-repo.yml +++ b/postgresql/tasks/pgdg-repo.yml @@ -10,7 +10,7 @@ - name: Add PGDG repository apt_repository: - repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main" + repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_lsb.codename}}-pgdg main" update_cache: yes - name: Add GPG key for PGDG repository diff --git a/postgresql/templates/postgresql.pref.j2 b/postgresql/templates/postgresql.pref.j2 index 74196cf6..608c4dd6 100644 --- a/postgresql/templates/postgresql.pref.j2 +++ b/postgresql/templates/postgresql.pref.j2 @@ -1,3 +1,3 @@ Package: postgresql-{{postgresql_version}} postgresql-client-common postgresql-common libpq5 ptop -Pin: release a={{ansible_distribution_release}}-pgdg +Pin: release a={{ansible_lsb.codename}}-pgdg Pin-Priority: 999 diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml index b0dce043..e75ec8f9 100644 --- a/redis/tasks/main.yml +++ b/redis/tasks/main.yml @@ -93,7 +93,7 @@ - nrpe - include: nrpe_stretch.yml - when: ansible_distribution_release == "stretch" and nrpe_evolix_config.stat.exists == true + when: ansible_lsb.codename == "stretch" and nrpe_evolix_config.stat.exists == true tags: - redis - nrpe diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index 17429954..5dddf87b 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -8,7 +8,7 @@ - name: "Set squid name (jessie)" set_fact: squid_daemon_name: squid3 - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "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_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "evolix whitelist is present (jessie)" copy: @@ -42,7 +42,7 @@ dest: /etc/squid3/whitelist.conf force: no notify: "reload squid3" - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "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_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - include: logrotate_stretch.yml when: ansible_distribution_major_version | version_compare('9', '>=') diff --git a/webapps/evoadmin-web/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml index 79d1e312..45d7e72e 100644 --- a/webapps/evoadmin-web/tasks/packages.yml +++ b/webapps/evoadmin-web/tasks/packages.yml @@ -19,4 +19,4 @@ allow_unauthenticated: yes with_items: - php5-pam - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 460dc28e..7dc18a25 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -17,7 +17,7 @@ name: www-evoadmin groups: shadow append: yes - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "Create www-evoadmin (Debian 9 or later)" user: @@ -52,7 +52,7 @@ dest: "{{ evoadmin_document_root }}" version: jessie update: no - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "Clone evoadmin repository (Debian 9 or later)" git: diff --git a/webapps/evoadmin-web/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml index d8405f8f..23b35204 100644 --- a/webapps/evoadmin-web/tasks/web.yml +++ b/webapps/evoadmin-web/tasks/web.yml @@ -7,7 +7,7 @@ option: "disable_functions" value: "shell-exec,system,passthru,putenv,popen" notify: reload apache2 - when: ansible_distribution_release == "jessie" + when: ansible_lsb.codename == "jessie" - name: "Set custom values for PHP config (Debian 9 or later)" ini_file: