Skip to content
Snippets Groups Projects
Commit ee0160ee authored by jurgenhaas's avatar jurgenhaas
Browse files

Replace deprecated "include" directive in Ansible 2.4

parent f7b042a7
Branches
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
tags: always tags: always
- name: "Configure Apache" - name: "Configure Apache"
include: apache.yml include_tasks: apache.yml
with_items: '{{ drupal.domains }}' with_items: '{{ drupal.domains }}'
loop_control: loop_control:
loop_var: drupal_domain loop_var: drupal_domain
...@@ -58,17 +58,17 @@ ...@@ -58,17 +58,17 @@
when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != [drupalRoot, '/index.php']|join('') when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != [drupalRoot, '/index.php']|join('')
tags: always tags: always
- include: install/{{ installSource.mode|default("none") }}.yml - include_tasks: install/{{ installSource.mode|default("none") }}.yml
when: drupal_first_installation when: drupal_first_installation
- include: install/{{ drupal.version|default("d7") }}.yml - include_tasks: install/{{ drupal.version|default("d7") }}.yml
when: drupal_first_installation when: drupal_first_installation
- include: deploy/{{ installSource.mode|default("none") }}.yml - include_tasks: deploy/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal when: drupal_install_drupal
tags: 'deploy' tags: 'deploy'
- include: deploy/{{ drupal.version|default("d7") }}.yml - include_tasks: deploy/{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal when: drupal_install_drupal
tags: 'deploy' tags: 'deploy'
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
with_items: '{{ drupal.links|default([]) }}' with_items: '{{ drupal.links|default([]) }}'
tags: 'deploy' tags: 'deploy'
- include: scss.yml - include_tasks: scss.yml
with_items: '{{ drupal.scss_dir|default([]) }}' with_items: '{{ drupal.scss_dir|default([]) }}'
loop_control: loop_control:
loop_var: scss_dir loop_var: scss_dir
tags: 'deploy' tags: 'deploy'
- include: users/{{ installSource.mode|default("none") }}.yml - include_tasks: users/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal and drupal.src is defined and drupal.src.name is defined when: drupal_install_drupal and drupal.src is defined and drupal.src.name is defined
tags: 'SetPermissions' tags: 'SetPermissions'
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
with_items: '{{ drupal.domains }}' with_items: '{{ drupal.domains }}'
when: item.install|default(true) when: item.install|default(true)
- include: files.yml - include_tasks: files.yml
with_nested: with_nested:
- '{{ drupal.domains }}' - '{{ drupal.domains }}'
- ['files', 'private'] - ['files', 'private']
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
with_items: '{{ drupal.domains }}' with_items: '{{ drupal.domains }}'
when: item.install|default(true) when: item.install|default(true)
- include: deploy/finalize_{{ drupal.version|default("d7") }}.yml - include_tasks: deploy/finalize_{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal when: drupal_install_drupal
tags: 'deploy' tags: 'deploy'
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
tags: 'deploy' tags: 'deploy'
- name: "Install Drupal Databases and Users" - name: "Install Drupal Databases and Users"
include: mysql.yml include_tasks: mysql.yml
with_items: '{{ drupal.domains }}' with_items: '{{ drupal.domains }}'
loop_control: loop_control:
loop_var: drupal_domain loop_var: drupal_domain
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- block: - block:
- name: "Install Certs" - name: "Install Certs"
include: '../../letsencrypt/tasks/cert.yml' include_tasks: '../../letsencrypt/tasks/cert.yml'
with_subelements: with_subelements:
- '{{ drupal_settings }}' - '{{ drupal_settings }}'
- domains - domains
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
- block: - block:
- name: "Install Drupal" - name: "Install Drupal"
include: install.yml include_tasks: install.yml
with_items: '{{ drupal_settings }}' with_items: '{{ drupal_settings }}'
loop_control: loop_control:
loop_var: drupal loop_var: drupal
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment