Consistency changes

.ansible-lint

@@ -1,5 +1,6 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
-  - '503'
+  - 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: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604
@@ -66,7 +65,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: |

handlers/main.yml

@@ -1,7 +1,7 @@
 # handlers file
 ---
 - name: restart supervisor
-  service:
+  ansible.builtin.service:
     name: supervisor
     state: restarted
   when: service_default_state | default('started') == 'started'

molecule/default/converge.yml

@@ -1,15 +1,15 @@
 ---
 - name: Converge
   hosts: all
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_default.yml"
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../vars/main.yml"
   roles:
     - ../../../

molecule/default/prepare.yml

@@ -3,13 +3,13 @@
   hosts: all
   become: true
   tasks:
     - name: include vars
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_default.yml"
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../vars/main.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"

tasks/configure.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | stat directories
-  stat:
+  ansible.builtin.stat:
     path: "{{ item }}/"
   register: stat_directories
   with_items:
@@ -16,8 +16,8 @@
     - supervisor-configure-directories
     - supervisor-configure-directories-stat
 
 - name: configure | create directories
-  file:
+  ansible.builtin.file:
     path: "{{ item.item }}"
     state: directory
     owner: "{{ supervisor_system_user }}"
@@ -29,8 +29,8 @@
     - supervisor-configure-directories
     - supervisor-configure-directories-create
 
 - name: configure | update configuration file - /etc/default/supervisor
-  template:
+  ansible.builtin.template:
     src: "{{ supervisor_default_file.lstrip('/') }}.j2"
     dest: "{{ supervisor_default_file }}"
     owner: "{{ supervisor_system_user }}"
@@ -42,7 +42,7 @@
     - supervisor-configure-configuration-default-supervisor
 
 - name: configure | update configuration file - /etc/supervisor/supervisord.conf
-  template:
+  ansible.builtin.template:
     src: "{{ supervisor_configuration_file.lstrip('/') }}.j2"
     dest: "{{ supervisor_configuration_file }}"
     owner: "{{ supervisor_system_user }}"

tasks/groups.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: groups | update group configuration files (present)
-  template:
+  ansible.builtin.template:
     src: etc/supervisor/conf.d/group.conf.j2
     dest: "/etc/supervisor/conf.d/{{ item.key }}.conf"
     owner: "{{ supervisor_system_user }}"
@@ -13,7 +13,7 @@
     - supervisor-groups-present
 
 - name: groups | update group configuration files (absent)
-  file:
+  ansible.builtin.file:
     path: "/etc/supervisor/conf.d/{{ item.key }}.conf"
     state: absent
   with_dict: "{{ supervisor_groups_absent }}"

tasks/install.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install | dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ supervisor_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -10,7 +10,7 @@
     - supervisor-install-dependencies
 
 - name: install | supervisor (specific version)
-  pip:
+  ansible.builtin.pip:
     name: supervisor
     version: "{{ supervisor_version }}"
     executable: "{{ supervisor_pip_executable | string }}"
@@ -19,7 +19,7 @@
     - supervisor-install-specific
 
 - name: install | supervisor (latest version)
-  pip:
+  ansible.builtin.pip:
     name: supervisor
     state: "{{ supervisor_version }}"
     executable: "{{ supervisor_pip_executable | string }}"

tasks/main.yml

@@ -1,47 +1,53 @@
 # tasks file
 ---
-- include: install.yml
+- name: install
+  ansible.builtin.import_tasks: install.yml
   tags:
     - configuration
     - supervisor
     - supervisor-install
 
-- include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - supervisor
     - supervisor-configure
 
-- include: service-initd.yml
+- name: service initd
+  ansible.builtin.import_tasks: service-initd.yml
   when: ansible_service_mgr != 'systemd'
   tags:
     - configuration
     - supervisor
     - supervisor-configure
     - supervisor-configure-initd
 
-- include: service-systemd.yml
+- name: service systemd
+  ansible.builtin.import_tasks: service-systemd.yml
   when: ansible_service_mgr == 'systemd'
   tags:
     - configuration
     - supervisor
     - supervisor-configure
     - supervisor-configure-systemd
 
-- include: programs.yml
+- name: programs
+  ansible.builtin.import_tasks: programs.yml
   tags:
     - configuration
     - supervisor
     - supervisor-programs
 
-- include: groups.yml
+- name: groups
+  ansible.builtin.import_tasks: groups.yml
   tags:
     - configuration
     - supervisor
     - supervisor-groups
 
 - name: start and enable service
-  service:
+  ansible.builtin.service:
     name: supervisor
     state: "{{ service_default_state | default('started') }}"
     enabled: "{{ service_default_enabled | default(true) | bool }}"

tasks/programs.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: programs | update program configuration files (present)
-  template:
+  ansible.builtin.template:
     src: etc/supervisor/conf.d/program.conf.j2
     dest: "/etc/supervisor/conf.d/{{ item.key }}.conf"
     owner: "{{ supervisor_system_user }}"
@@ -13,7 +13,7 @@
     - supervisor-programs-present
 
 - name: programs | update program configuration files (absent)
-  file:
+  ansible.builtin.file:
     path: "/etc/supervisor/conf.d/{{ item.key }}.conf"
     state: absent
   with_dict: "{{ supervisor_programs_absent }}"

tasks/service-initd.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | initd | update script
-  template:
+  ansible.builtin.template:
     src: "{{ supervisor_etc_init_d_file.lstrip('/') }}.j2"
     dest: "{{ supervisor_etc_init_d_file }}"
     owner: "{{ supervisor_system_user }}"

tasks/service-systemd.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | systemd | update script
-  template:
+  ansible.builtin.template:
     src: "{{ supervisor_etc_systemd_file.lstrip('/') }}.j2"
     dest: "{{ supervisor_etc_systemd_file }}"
     owner: "{{ supervisor_system_user }}"
@@ -13,7 +13,7 @@
     - supervisor-service-systemd-update
 
 - name: service | systemd | reload
-  systemd:
+  ansible.builtin.systemd:
     daemon_reload: true
   when: _update_systemd_script is changed
   tags:

tests/tasks/pre.yml

@@ -1,7 +1,7 @@
 # pre test file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - "python{{ supervisor_python_version_major is version('3', '>=') | ternary('3', '') }}"
       - curl
@@ -10,7 +10,7 @@
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
 
 - name: install pip  # noqa command-instead-of-module
-  shell: >
+  ansible.builtin.shell: >
     curl -sL {{ supervisor_get_pip_url }} | python{{ supervisor_python_version_major | string }} -
   changed_when: false
   tags:

tests/test.yml

@@ -5,12 +5,12 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../

tests/vagrant.yml

@@ -5,12 +5,12 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../