diff --git a/.ansible-lint b/.ansible-lint index 7e0172a..b04781e 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,4 +1,5 @@ --- warn_list: - role-name + - name[play] - name[casing] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 292e437..7e2bc34 100644 --- a/.github/workflows/ci.yml +++ b/.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: | diff --git a/handlers/main.yml b/handlers/main.yml index dc1d63b..6c604ab 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,7 +1,7 @@ # handlers file --- - name: restart sysfsutils - service: + ansible.builtin.service: name: sysfsutils state: restarted when: service_default_state | default('started') == 'started' diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 73043c4..8596f09 100644 --- a/molecule/default/converge.yml +++ b/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: - ../../../ diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index bb63e11..4e9fc84 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -4,6 +4,6 @@ become: true tasks: - 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" diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index d88340e..9b784b1 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -4,6 +4,6 @@ become: true tasks: - 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/post.yml" + ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/post.yml" diff --git a/tasks/main.yml b/tasks/main.yml index e770e41..6590b67 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,7 +1,7 @@ # tasks file --- - name: install - apt: + ansible.builtin.apt: name: "{{ sysfs_dependencies }}" state: "{{ apt_install_state | default('latest') }}" update_cache: true @@ -12,7 +12,7 @@ - sysfs-install - name: validate actions - fail: + ansible.builtin.fail: msg: "Action {{ item.value.action }} is not supported" when: - item.value.action is defined @@ -24,7 +24,7 @@ - sysfs-validate - name: create (configuration) directory - file: + ansible.builtin.file: path: /etc/sysfs.d state: directory owner: root @@ -38,7 +38,7 @@ - sysfs-configuration-sysfs-d-directory - name: update specific configuration files - template: + ansible.builtin.template: src: etc/sysfs.d/sysfs.conf.j2 dest: "/etc/sysfs.d/{{ item.key }}" owner: root diff --git a/tests/tasks/post.yml b/tests/tasks/post.yml index 0946615..c3e7e80 100644 --- a/tests/tasks/post.yml +++ b/tests/tasks/post.yml @@ -1,7 +1,7 @@ # post test file --- - name: check permissions - stat: + ansible.builtin.stat: path: "{{ item }}" register: _check_permissions changed_when: false @@ -13,7 +13,7 @@ - /sys/power/state - name: check values - shell: > + ansible.builtin.shell: > awk 'NR>1 {print $1}' RS=[ FS=] {{ item }} register: _check_values changed_when: false diff --git a/tests/tasks/pre.yml b/tests/tasks/pre.yml index 0dd2a59..038d29f 100644 --- a/tests/tasks/pre.yml +++ b/tests/tasks/pre.yml @@ -1,5 +1,5 @@ # pre test file --- - name: create user (if needed) - user: + ansible.builtin.user: name: dummy diff --git a/tests/test.yml b/tests/test.yml index ca5ea5e..4ad8383 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -5,11 +5,11 @@ become: true pre_tasks: - 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 }}/tasks/pre.yml" + ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml" roles: - ../../ post_tasks: - name: include tasks - include: "{{ playbook_dir }}/tasks/post.yml" + ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/post.yml" diff --git a/tests/vagrant.yml b/tests/vagrant.yml index 3dfeb1c..09c6f19 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -5,11 +5,11 @@ become: true pre_tasks: - 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 }}/tasks/pre.yml" + ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml" roles: - ../../ post_tasks: - name: include tasks - include: "{{ playbook_dir }}/tasks/post.yml" + ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/post.yml"