Merge pull request #19 from Oefenweb/consistency-changes

Consistency changes

.ansible-lint

@@ -1,4 +1,6 @@
 ---
 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: |
@@ -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: |

requirements.yml

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

tasks/main.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install dependencies
- apt:
+ ansible.builtin.apt:
  name: "{{ swapfile_dependencies }}"
  state: "{{ apt_install_state | default('latest') }}"
  update_cache: true
@@ -12,10 +12,14 @@
  - swapfile-install
  - swapfile-install-dependencies
 
-- block:
-
+- name: swap file
+ when: not swapfile_size | bool
+ tags:
+ - configuration
+ - swapfile
+ block:
  - name: write swap file # noqa command-instead-of-module
- command: >
+ ansible.builtin.command: >
  fallocate -l {{ swapfile_size }} {{ swapfile_file }}
  args:
  creates: "{{ swapfile_file }}"
@@ -24,7 +28,7 @@
  - swapfile-write-file
 
  - name: set swap file permissions
- file:
+ ansible.builtin.file:
  path: "{{ swapfile_file }}"
  owner: root
  group: root
@@ -33,22 +37,24 @@
  - swapfile-set-file-permissions
 
  - name: create swap file # noqa command-instead-of-module
- command: >
+ ansible.builtin.command: >
  mkswap {{ swapfile_file }}
  register: _create_swapfile
- when: _write_swapfile.changed
+ changed_when: true
+ when: _write_swapfile is changed
  tags:
  - swapfile-mkswap
 
  - name: enable swapfile # noqa command-instead-of-module
- command: >
+ ansible.builtin.command: >
  swapon {{ swapfile_file }}
+ changed_when: true
  when: _create_swapfile is changed
  tags:
  - swapfile-enable-swapfile
 
  - name: add swapfile to /etc/fstab
- mount:
+ ansible.posix.mount:
  name: none
  src: "{{ swapfile_file }}"
  fstype: swap
@@ -59,14 +65,8 @@
  tags:
  - swapfile-fstab
 
- # TODO: Changing this to `when: swapfile_size` seems to fail, find out why
- when: swapfile_size != false
- tags:
- - configuration
- - swapfile
-
 - name: configure vm.swappiness
- sysctl:
+ ansible.posix.sysctl:
  name: vm.swappiness
  value: "{{ swapfile_swappiness | string }}"
  reload: true
@@ -78,7 +78,7 @@
  - swapfile-vm-swappiness
 
 - name: configure vm.vfs_cache_pressure
- sysctl:
+ ansible.posix.sysctl:
  name: vm.vfs_cache_pressure
  value: "{{ swapfile_vfs_cache_pressure | string }}"
  reload: true