From 16a9ebf97f36bf3682c155912e4c1103427b4d12 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Thu, 21 Sep 2017 21:30:47 +0300 Subject: [PATCH] Adjust playbooks for Ansible 2.4 import changes Ansible 2.4 changes the way includes work. Now you have to use "import" for playbooks and tasks that are static, and "include" for those that are dynamic (ie, those that use variables, loops, etc). See: http://docs.ansible.com/ansible/devel/playbooks_reuse_includes.html --- roles/common/tasks/main.yml | 10 +++++----- roles/common/tasks/packages_Debian.yml | 4 ++-- roles/common/tasks/packages_Ubuntu.yml | 4 ++-- roles/munin/tasks/main.yml | 4 ++-- roles/nginx/tasks/main.yml | 2 +- roles/nginx/tasks/vhosts.yml | 2 +- roles/php-fpm/tasks/main.yml | 4 ++-- site.yml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index da86c64..c33fcde 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -3,16 +3,16 @@ # lineinfile: dest=/etc/hosts insertafter=^127.0.0.1 line='127.0.1.1 {{ inventory_hostname }}' # tags: hostname -- include: ntp.yml +- import_tasks: ntp.yml tags: ntp -- include: packages_{{ ansible_distribution }}.yml +- include_tasks: packages_{{ ansible_distribution }}.yml tags: packages -- include: iptables_{{ ansible_distribution }}.yml +- include_tasks: iptables_{{ ansible_distribution }}.yml tags: firewall -- include: sshd.yml +- import_tasks: sshd.yml tags: sshd # containers identify as virtualization hosts, which makes this tricky, because we have actual Debian VM hosts! @@ -31,7 +31,7 @@ template: src=etc/udev/rules.d/60-scheduler.rules.j2 dest=/etc/udev/rules.d/60-scheduler.rules owner=root group=root mode=0644 tags: udev -- include: ssh-keys.yml +- import_tasks: ssh-keys.yml tags: ssh-keys # vim: set sw=2 ts=2: diff --git a/roles/common/tasks/packages_Debian.yml b/roles/common/tasks/packages_Debian.yml index 35fead6..329bf18 100644 --- a/roles/common/tasks/packages_Debian.yml +++ b/roles/common/tasks/packages_Debian.yml @@ -20,9 +20,9 @@ - lrzip - unzip -- include: cron-apt.yml +- import_tasks: cron-apt.yml tags: cron-apt -- include: tarsnap.yml +- import_tasks: tarsnap.yml # vim: set sw=2 ts=2: diff --git a/roles/common/tasks/packages_Ubuntu.yml b/roles/common/tasks/packages_Ubuntu.yml index bae6afb..a6d6c0a 100644 --- a/roles/common/tasks/packages_Ubuntu.yml +++ b/roles/common/tasks/packages_Ubuntu.yml @@ -43,9 +43,9 @@ - command-not-found-data - python3-commandnotfound -- include: cron-apt.yml +- import_tasks: cron-apt.yml tags: cron-apt -- include: tarsnap.yml +- import_tasks: tarsnap.yml # vim: set sw=2 ts=2: diff --git a/roles/munin/tasks/main.yml b/roles/munin/tasks/main.yml index 77b917c..b6009b1 100644 --- a/roles/munin/tasks/main.yml +++ b/roles/munin/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: munin.yml +- import_tasks: munin.yml tags: munin -- include: munin-node.yml +- import_tasks: munin-node.yml tags: munin-node diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index e6dd0fb..ab31a0d 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -34,7 +34,7 @@ file: path=/var/cache/nginx/cached/fastcgi state=directory owner=nginx group=nginx mode=0755 tags: nginx -- include: vhosts.yml +- import_tasks: vhosts.yml when: nginx_vhosts is defined tags: nginx diff --git a/roles/nginx/tasks/vhosts.yml b/roles/nginx/tasks/vhosts.yml index 77a5511..8521ff6 100644 --- a/roles/nginx/tasks/vhosts.yml +++ b/roles/nginx/tasks/vhosts.yml @@ -32,7 +32,7 @@ with_items: "{{ nginx_vhosts }}" tags: wordpress -- include: letsencrypt.yml +- import_tasks: letsencrypt.yml when: use_letsencrypt is defined and use_letsencrypt == True tags: letsencrypt diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml index 04a675f..97e8d49 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -2,11 +2,11 @@ # Note: Debian 9's php-fpm config is identical to Ubuntu 16.04's, so for now we # can capitalize on that and use the same tasks. -- include: Debian.yml +- import_tasks: Debian.yml when: ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '<') tags: php-fpm -- include: Ubuntu.yml +- import_tasks: Ubuntu.yml when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) tags: php-fpm diff --git a/site.yml b/site.yml index ce5eb00..311dc89 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,6 @@ --- # file: site.yml -- include: web.yml +- import_playbook: web.yml # vim: set sw=2 ts=2: