Skip to content

Commit

Permalink
Fix: Update haveged-install ansible role
Browse files Browse the repository at this point in the history
Update molecule test formats and update the role to build with
latest version of ansible. Fix ansible lint errors and warnings.

Update tox and pre-commit dependencies to build with latest versions
of ansible and molecule.

Change-Id: Id80262c552f34092ec18db3bf082127f5ee672ba
Signed-off-by: Anil Belur <[email protected]>
  • Loading branch information
askb committed Feb 11, 2024
1 parent 2a9e9c6 commit 909962b
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 22 deletions.
4 changes: 1 addition & 3 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ rules:
max-spaces-inside: 1
level: error
line-length: disable
# NOTE(retr0h): Templates no longer fail this lint rule.
# Uncomment if running old Molecule templates.
# truthy: disable
truthy: disable

ignore: |
.tox/
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ galaxy_info:
versions:
- 7
- 8
- 9

- name: Ubuntu
versions:
- bionic
- focal
- jammy

galaxy_tags:
- system
Expand Down
6 changes: 2 additions & 4 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ dependency:
name: galaxy
driver:
name: docker
lint: |
set -e
yamllint .
ansible-lint tasks/*.yml
platforms:
- name: centos7
image: centos:7
Expand All @@ -16,6 +12,8 @@ platforms:
image: ubuntu:18.04
- name: ubuntu2004
image: ubuntu:20.04
- name: ubuntu2204
image: ubuntu:22.04
provisioner:
name: ansible
scenario:
Expand Down
10 changes: 9 additions & 1 deletion molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
gather_facts: true
tasks:
- name: Update APT cache
apt:
ansible.builtin.package:
update_cache: yes
when: ansible_distribution == 'Ubuntu'
become: true

- name: Install EPEL release repo
ansible.builtin.yum:
name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
state: present
disable_gpg_check: True
when: ansible_os_family == 'RedHat'
become: true
12 changes: 8 additions & 4 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
---
- name: Install Epel Repo
package: name=epel-release state=present
ansible.builtin.package:
name: epel-release
state: present
when: ansible_os_family == "RedHat"
become: true

- name: Install haveged package
package: name=haveged state=present
ansible.builtin.package:
name: haveged
state: present
become: true

- name: Enable haveged service (Ubuntu)
service:
ansible.builtin.service:
name: haveged
enabled: yes
become: true
when: ansible_distribution == 'Ubuntu'

- name: Enable haveged service (RedHat)
systemd:
ansible.builtin.systemd:
name: haveged
enabled: yes
become: true
Expand Down
29 changes: 20 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,28 @@
minversion = 1.6
envlist =
molecule,
pre-commit
pre-commit,
lint
skipsdist=true

[testenv:molecule]
basepython = python3
deps =
ansible~=2.9.6
ansible-lint~=4.2.0
detox~=0.18
ansible
docker
yamllint
molecule~=3.0.8
molecule[docker]
pytest~=5.4.0
molecule
molecule-docker
passenv = *
commands =
./molecule.sh
allowlist_externals =
./molecule.sh

[testenv:pre-commit]
allowlist_externals =
/bin/sh
deps = pre-commit
allowlist_externals = /bin/sh
passenv = HOME
commands =
pre-commit run --all-files --show-diff-on-failure
/bin/sh -c 'if ! git config --get user.name > /dev/null; then \
Expand All @@ -44,3 +43,15 @@ commands =
/bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \
git config --global --unset user.email; \
rm -f .git/REMOVE_USEREMAIL; fi"

[testenv:lint]
basepython = python310
deps =
ansible-lint
yamllint
commands =
/bin/bash -c "ansible-lint tasks/*.yml"
yamllint .
allowlist_externals =
/bin/bash
yamllint

0 comments on commit 909962b

Please sign in to comment.