Merge pull request #62 from Oefenweb/consistency-changes

Consistency changes

Author: tersmitten

.ansible-lint

@@ -1,5 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
-  - no-handler

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -42,8 +44,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604
@@ -62,7 +62,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |

molecule/default/converge.yml

@@ -4,6 +4,6 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../

molecule/default/prepare.yml

@@ -4,10 +4,11 @@
   become: true
   tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../defaults/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../defaults/main.yml"
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
   handlers:
-    - import_tasks: "{{ playbook_dir }}/../../tests/handlers/main.yml"
+    - name: include handlers
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/handlers/main.yml"

requirements.yml

@@ -1,3 +1,4 @@
 # requirements file
 ---
-collections: []
+collections:
+  - name: community.mysql

tasks/chown.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: change owner (and group)
-  file:
+  ansible.builtin.file:
     path: "{{ item.path }}"
     owner: "{{ item.owner | default('www-data') }}"
     group: "{{ item.group | default(item.owner) | default('www-data') }}"

tasks/configure.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | create (data) directories
-  file:
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     owner: root

tasks/core.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: core | check download
-  command: >
+  ansible.builtin.command: >
     test -f {{ item.path }}/wp-load.php
   register: _check_download
   failed_when: false
@@ -11,17 +11,18 @@
     - wordpress-core-is-downloaded
 
 - name: core | download
-  command: >
+  ansible.builtin.command: >
     wp-cli core download
     --allow-root --no-color --path='{{ item.item.path }}'
     --locale='{{ item.item.locale | default('en_US') }}'
+  changed_when: true
   with_items: "{{ _check_download.results | default([]) }}"
   when: item.rc != 0
   tags:
     - wordpress-core-downloaded
 
 - name: core | configure
-  command: >
+  ansible.builtin.command: >
     wp-cli core config
     --allow-root --no-color --path='{{ item.path }}'
     --dbname='{{ item.dbname }}'
@@ -36,7 +37,7 @@
     - wordpress-core-configure
 
 - name: core | identify installation
-  command: >
+  ansible.builtin.command: >
     wp-cli core is-installed
     --allow-root --no-color --path='{{ item.path }}'
   register: _check_installation
@@ -47,20 +48,21 @@
     - wordpress-core-is-installed
 
 - name: core | install
-  command: >
+  ansible.builtin.command: >
     wp-cli core install
     --allow-root --no-color --path='{{ item.item.path }}'
     --url='{{ item.item.url }}' --title='{{ item.item.title }}'
     --admin_name='{{ item.item.admin_name | default('admin') }}'
     --admin_email='{{ item.item.admin_email }}'
     --admin_password='{{ item.item.admin_password }}'
+  changed_when: true
   with_items: "{{ _check_installation.results | default([]) }}"
   when: item.rc != 0
   tags:
     - wordpress-core-install
 
 - name: core | check install
-  command: >
+  ansible.builtin.command: >
     wp-cli core is-installed
     --allow-root --no-color --path='{{ item.path }}'
   changed_when: false

tasks/main.yml

@@ -1,60 +1,70 @@
 # tasks file
 ---
-- include: wp-cli.yml
+- name: wp-cli
+  ansible.builtin.import_tasks: wp-cli.yml
   tags:
     - configuration
     - wordpress
     - wordpress-wp-cli
 
-- include: core.yml
+- name: core
+  ansible.builtin.import_tasks: core.yml
   tags:
     - configuration
     - wordpress
     - wordpress-core
 
-- include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - wordpress
     - wordpress-configure
 
-- include: wp-cron.yml
+- name: wp-cron
+  ansible.builtin.import_tasks: wp-cron.yml
   tags:
     - configuration
     - wordpress
     - wordpress-wp-cron
 
-- include: themes.yml
+- name: themes
+  ansible.builtin.import_tasks: themes.yml
   tags:
     - configuration
     - wordpress
     - wordpress-themes
 
-- include: plugins.yml
+- name: plugins
+  ansible.builtin.import_tasks: plugins.yml
   tags:
     - configuration
     - wordpress
     - wordpress-plugins
 
-- include: users.yml
+- name: users
+  ansible.builtin.import_tasks: users.yml
   tags:
     - configuration
     - wordpress
     - wordpress-users
 
-- include: options.yml
+- name: options
+  ansible.builtin.import_tasks: options.yml
   tags:
     - configuration
     - wordpress
     - wordpress-options
 
-- include: queries.yml
+- name: queries
+  ansible.builtin.import_tasks: queries.yml
   tags:
     - configuration
     - wordpress
     - wordpress-queries
 
-- include: chown.yml
+- name: chown
+  ansible.builtin.import_tasks: chown.yml
   tags:
     - configuration
     - wordpress

tasks/options.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: add options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}' '{{ item.1.value }}' --autoload={{ 'yes' if item.1.autoload | default(true) else 'no' }}
@@ -16,7 +16,7 @@
     - wordpress-options-add
 
 - name: update options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}' '{{ item.1.value }}'
@@ -30,7 +30,7 @@
     - wordpress-options-update
 
 - name: delete options
-  command: >
+  ansible.builtin.command: >
     wp-cli option
     --allow-root --no-color --path='{{ item.0.path }}'
     {{ item.1.command }} '{{ item.1.name }}'