Ansible API change: use import_tasks instead of include

This commit is contained in:
Alexander Grothe 2017-11-12 19:07:21 +01:00
parent a53e0af0c4
commit b2493a5e42
4 changed files with 11 additions and 11 deletions

View File

@ -191,7 +191,7 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation:
- always - always
handlers: handlers:
- include: handlers/main.yml - import_tasks: handlers/main.yml
#+END_SRC #+END_SRC
** yavdr07-headless.yml ** yavdr07-headless.yml
For a headless server installation ~yavdr07-headless.yml~ is a good choice 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: tags:
- always - always
handlers: handlers:
- include: handlers/main.yml - import_tasks: handlers/main.yml
#+END_SRC #+END_SRC
* Hosts * 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: 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 #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/main.yml :mkdirp yes :padline no
--- ---
# file: roles/yavdr-xorg/tasks/main.yml # file: roles/yavdr-xorg/tasks/main.yml
- include: setup-xorg.yml tags=install,update - import_tasks: setup-xorg.yml tags=install,update
- include: detect-xorg.yml tags=xorg:detect,install - import_tasks: detect-xorg.yml tags=xorg:detect,install
- include: desktop-session.yml tags=install,update - import_tasks: desktop-session.yml tags=install,update
#+END_SRC #+END_SRC
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no

View File

@ -1,5 +1,5 @@
--- ---
# file: roles/yavdr-xorg/tasks/main.yml # file: roles/yavdr-xorg/tasks/main.yml
- include: setup-xorg.yml tags=install,update - import_tasks: setup-xorg.yml tags=install,update
- include: detect-xorg.yml tags=xorg:detect,install - import_tasks: detect-xorg.yml tags=xorg:detect,install
- include: desktop-session.yml tags=install,update - import_tasks: desktop-session.yml tags=install,update

View File

@ -17,4 +17,4 @@
tags: tags:
- always - always
handlers: handlers:
- include: handlers/main.yml - import_tasks: handlers/main.yml

View File

@ -9,7 +9,7 @@
- yavdr-common # install and configure the basic system - yavdr-common # install and configure the basic system
- autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers - autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers
# (e.g. nvidia, virtualbox) # (e.g. nvidia, virtualbox)
# - nvidia-387 # - nvidia-387 # install very recent nvidia-387 from ppa:graphics-drivers/ppa
- vdr # install vdr and related packages - vdr # install vdr and related packages
- yavdr-network # enable network client capabilities - yavdr-network # enable network client capabilities
- samba-install # install samba server - samba-install # install samba server
@ -32,4 +32,4 @@
- always - always
handlers: handlers:
- include: handlers/main.yml - import_tasks: handlers/main.yml