From b2493a5e42edb18143c55989f2e488c38124f908 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sun, 12 Nov 2017 19:07:21 +0100 Subject: [PATCH] Ansible API change: use import_tasks instead of include --- Manual.org | 10 +++++----- roles/yavdr-xorg/tasks/main.yml | 6 +++--- yavdr07-headless.yml | 2 +- yavdr07.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Manual.org b/Manual.org index 49498bd..9fed146 100644 --- a/Manual.org +++ b/Manual.org @@ -191,7 +191,7 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation: - always handlers: - - include: handlers/main.yml + - import_tasks: handlers/main.yml #+END_SRC ** yavdr07-headless.yml For a headless server installation ~yavdr07-headless.yml~ is a good choice @@ -215,7 +215,7 @@ For a headless server installation ~yavdr07-headless.yml~ is a good choice tags: - always handlers: - - include: handlers/main.yml + - import_tasks: handlers/main.yml #+END_SRC * Hosts This playbook can either be used to run the installation on the localhost or any other PC in the network that can be accessed via ssh. Simply add the host names or IP addresses to the hosts file in the respective section: @@ -1414,9 +1414,9 @@ b'\xde\xad\xbe\xef' #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/main.yml :mkdirp yes :padline no --- # file: roles/yavdr-xorg/tasks/main.yml -- include: setup-xorg.yml tags=install,update -- include: detect-xorg.yml tags=xorg:detect,install -- include: desktop-session.yml tags=install,update +- import_tasks: setup-xorg.yml tags=install,update +- import_tasks: detect-xorg.yml tags=xorg:detect,install +- import_tasks: desktop-session.yml tags=install,update #+END_SRC #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no diff --git a/roles/yavdr-xorg/tasks/main.yml b/roles/yavdr-xorg/tasks/main.yml index 11e6d1b..0a4d7bf 100644 --- a/roles/yavdr-xorg/tasks/main.yml +++ b/roles/yavdr-xorg/tasks/main.yml @@ -1,5 +1,5 @@ --- # file: roles/yavdr-xorg/tasks/main.yml -- include: setup-xorg.yml tags=install,update -- include: detect-xorg.yml tags=xorg:detect,install -- include: desktop-session.yml tags=install,update +- import_tasks: setup-xorg.yml tags=install,update +- import_tasks: detect-xorg.yml tags=xorg:detect,install +- import_tasks: desktop-session.yml tags=install,update diff --git a/yavdr07-headless.yml b/yavdr07-headless.yml index 0b02614..c96538e 100644 --- a/yavdr07-headless.yml +++ b/yavdr07-headless.yml @@ -17,4 +17,4 @@ tags: - always handlers: - - include: handlers/main.yml + - import_tasks: handlers/main.yml diff --git a/yavdr07.yml b/yavdr07.yml index a8f55f6..0ecb558 100644 --- a/yavdr07.yml +++ b/yavdr07.yml @@ -9,7 +9,7 @@ - yavdr-common # install and configure the basic system - autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers # (e.g. nvidia, virtualbox) - # - nvidia-387 + # - nvidia-387 # install very recent nvidia-387 from ppa:graphics-drivers/ppa - vdr # install vdr and related packages - yavdr-network # enable network client capabilities - samba-install # install samba server @@ -32,4 +32,4 @@ - always handlers: - - include: handlers/main.yml + - import_tasks: handlers/main.yml