Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from oravirt:master #39

Merged
merged 3 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,9 @@ on:
jobs:
build:

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
# Important: This sets up your GITHUB_WORKSPACE environment variable
- uses: actions/checkout@v2

- name: Lint roles
uses: ansible/[email protected]
with:
targets: |
inventory/*
playbooks/*
roles/*
- uses: actions/checkout@v4
- name: Run ansible-lint
uses: ansible/[email protected]
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ repos:
entry: ansible-doctor -r -f roles

- repo: https://github.com/ansible-community/ansible-lint.git
rev: v6.20.3
rev: v6.22.1
hooks:
- id: ansible-lint
entry: ansible-lint --force-color -p
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/ansible-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- "ansible-lint v6.22.1 (oravirt#392)"
3 changes: 3 additions & 0 deletions changelogs/fragments/assert.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- "orahost: Fix warning conditional statements should not include jinja2 templating (oravirt#391)"
3 changes: 3 additions & 0 deletions changelogs/fragments/lsof.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- "common: install lsof for all RHEL/OL distributions (oravirt#391)"
2 changes: 2 additions & 0 deletions roles/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ common_packages_el6:
- procps
- module-init-tools
- ethtool
- lsof
- bc
- nc
- bind-utils
Expand Down Expand Up @@ -110,6 +111,7 @@ common_packages_el7:
- procps
- module-init-tools
- ethtool
- lsof
- bc
- nc
- bind-utils
Expand Down
2 changes: 2 additions & 0 deletions roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ common_packages_el6:
- procps
- module-init-tools
- ethtool
- lsof
- bc
- nc
- bind-utils
Expand Down Expand Up @@ -103,6 +104,7 @@ common_packages_el7:
- procps
- module-init-tools
- ethtool
- lsof
- bc
- nc
- bind-utils
Expand Down
4 changes: 2 additions & 2 deletions roles/orahost/tasks/assert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
ansible.builtin.assert:
quiet: true
that:
- "ansible_os_family == '{{ os_family_supported }}'"
- "ansible_facts['distribution_version'] is version('{{ os_min_supported_version }}', '>=')"
- ansible_os_family == os_family_supported
- ansible_facts['distribution_version'] is version(os_min_supported_version, '>=')
tags:
- oscheck

Expand Down
2 changes: 1 addition & 1 deletion tools/dev/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# . ~/venv/ansible-oracle/bin/activate
# pip --require-virtualenv -v install -r tools/dev/requirements_dev.txt
#
ansible-lint==6.20.3
ansible-lint==6.22.1
ansible-navigator==3.4.0
pre-commit==3.4.0

Expand Down
Loading