From 9e58e0b4e4dc9e78f1105d0bf35d688681694e9e Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Thu, 23 May 2019 17:10:19 +0200 Subject: [PATCH] Fix deprecation warnings for Ansible 2.8 --- Manual.org | 14 +++++++------- roles/autoinstall-dvbsky-firmware/tasks/main.yml | 2 +- roles/autoinstall-satip/tasks/main.yml | 2 +- roles/dvd/tasks/main.yml | 4 ++-- roles/yavdr-common/tasks/configure_system.yml | 2 +- roles/yavdr-xorg/tasks/detect-xorg.yml | 8 ++++---- roles/yavdr-xorg/tasks/setup-xorg.yml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Manual.org b/Manual.org index 184c349..818ceca 100644 --- a/Manual.org +++ b/Manual.org @@ -744,7 +744,7 @@ yavdr-common executes the following tasks: with_first_found: - files: - /etc/update-manager/release-upgrades - skip: true + errors: ignore #+END_SRC ***** Install essential packages @@ -2618,7 +2618,7 @@ preferred_refreshrates: - xserver-xorg-video-intel - i965-va-driver-shaders state: present - when: intel_detected and not nvidia_detected + when: intel_detected | bool and not nvidia_detected | bool - name: Install yaVDR Media (e.g. Backgrounds) apt: @@ -2740,8 +2740,8 @@ preferred_refreshrates: masked: false daemon_reload: true when: - - nvidia_detected - - nvidia_driver_installed + - nvidia_detected | bool + - nvidia_driver_installed | bool - '"nouveau" in modules' - name: "start x-verbose@.service" @@ -2832,14 +2832,14 @@ preferred_refreshrates: dest: /etc/X11/xorg.conf backup: yes when: - - nvidia_detected + - nvidia_detected | bool - name: intel xorg config snippet template: src: templates/20-intel.conf.j2 dest: /etc/X11/xorg.conf.d/20-intel.conf when: - - intel_detected and not nvidia_detected + - intel_detected | bool and not nvidia_detected | bool - name: server flags config snippet to disable screen blanking template: @@ -6004,7 +6004,7 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip apt: name: vdr-plugin-satip state: present - when: satip_devices + when: satip_devices | bool notify: [ 'Restart VDR' ] #+END_SRC ** autoinstall-targavfd diff --git a/roles/autoinstall-dvbsky-firmware/tasks/main.yml b/roles/autoinstall-dvbsky-firmware/tasks/main.yml index 1c6303e..ffafd82 100644 --- a/roles/autoinstall-dvbsky-firmware/tasks/main.yml +++ b/roles/autoinstall-dvbsky-firmware/tasks/main.yml @@ -35,7 +35,7 @@ state: absent when: - dvbsky_firmware_files is defined - - dvbsky_firmware_files + - dvbsky_firmware_files | bool tags: - install - autodetect diff --git a/roles/autoinstall-satip/tasks/main.yml b/roles/autoinstall-satip/tasks/main.yml index 1017052..fe1f5de 100644 --- a/roles/autoinstall-satip/tasks/main.yml +++ b/roles/autoinstall-satip/tasks/main.yml @@ -12,5 +12,5 @@ apt: name: vdr-plugin-satip state: present - when: satip_devices + when: satip_devices | bool notify: [ 'Restart VDR' ] diff --git a/roles/dvd/tasks/main.yml b/roles/dvd/tasks/main.yml index 9abbf8f..46e1d03 100644 --- a/roles/dvd/tasks/main.yml +++ b/roles/dvd/tasks/main.yml @@ -16,8 +16,8 @@ dpkg_reconfigure: pkg: libdvd-pkg answers: - libdvd-pkg/post-invoke_hook-install: boolean true - libdvd-pkg/build: boolean true + libdvd-pkg/post-invoke_hook-install: "boolean true" + libdvd-pkg/build: "boolean true" - name: change udev rule to allow KODI to eject optical disks diff --git a/roles/yavdr-common/tasks/configure_system.yml b/roles/yavdr-common/tasks/configure_system.yml index 3dd9c1a..42326e5 100644 --- a/roles/yavdr-common/tasks/configure_system.yml +++ b/roles/yavdr-common/tasks/configure_system.yml @@ -28,7 +28,7 @@ with_first_found: - files: - /etc/update-manager/release-upgrades - skip: true + errors: ignore - name: apt | install basic packages apt: name: diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml index 1bbe709..c987ee5 100644 --- a/roles/yavdr-xorg/tasks/detect-xorg.yml +++ b/roles/yavdr-xorg/tasks/detect-xorg.yml @@ -89,8 +89,8 @@ masked: false daemon_reload: true when: - - nvidia_detected - - nvidia_driver_installed + - nvidia_detected | bool + - nvidia_driver_installed | bool - '"nouveau" in modules' - name: "start x-verbose@.service" @@ -181,14 +181,14 @@ dest: /etc/X11/xorg.conf backup: yes when: - - nvidia_detected + - nvidia_detected | bool - name: intel xorg config snippet template: src: templates/20-intel.conf.j2 dest: /etc/X11/xorg.conf.d/20-intel.conf when: - - intel_detected and not nvidia_detected + - intel_detected | bool and not nvidia_detected | bool - name: server flags config snippet to disable screen blanking template: diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml index 96fdcd0..7800f02 100644 --- a/roles/yavdr-xorg/tasks/setup-xorg.yml +++ b/roles/yavdr-xorg/tasks/setup-xorg.yml @@ -84,7 +84,7 @@ - xserver-xorg-video-intel - i965-va-driver-shaders state: present - when: intel_detected and not nvidia_detected + when: intel_detected | bool and not nvidia_detected | bool - name: Install yaVDR Media (e.g. Backgrounds) apt: