Skip to content

Commit

Permalink
ansible-lint - use changed_when even for tasks with conditionals (#326)
Browse files Browse the repository at this point in the history
* ansible-lint - use changed_when even for tasks with conditionals

ansible-lint now requires the use of changed_when even for tasks
that are conditional

Signed-off-by: Rich Megginson <rmeggins@redhat.com>

* fix tests for fingerprinting

---------

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
  • Loading branch information
richm authored Apr 10, 2023
1 parent bf74fd2 commit d1befca
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions roles/rsyslog/tasks/inputs/ovirt/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,5 @@
when:
- __rsyslog_input.type | d() == 'ovirt'
- ansible_selinux.mode in ["enforcing", "permissive"]
changed_when: true
notify: Restart rsyslogd
1 change: 1 addition & 0 deletions tests/tasks/check_daemon_config_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@
when: __check_systemctl_status == "true"
failed_when: "'error' in __result.stdout or 'a RainerScript command'
in __result.stdout or __result is failed"
changed_when: false
1 change: 1 addition & 0 deletions tests/tests_basics_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand Down
8 changes: 8 additions & 0 deletions tests/tests_basics_forwards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand All @@ -166,6 +167,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_facility_only") {
local2.* action(name="forwards_facility_only"
type="omfwd"
Expand All @@ -188,6 +190,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_only") {
*.err action(name="forwards_severity_only"
type="omfwd"
Expand All @@ -210,6 +213,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_no_severity_and_facility") {
*.* action(name="forwards_no_severity_and_facility"
type="omfwd"
Expand All @@ -232,6 +236,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_no_severity_and_facility_udp") {
*.* action(name="forwards_no_severity_and_facility_udp"
type="omfwd"
Expand All @@ -255,6 +260,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_no_severity_and_facility_protocol_port") {
*.* action(name="forwards_no_severity_and_facility_protocol_port"
type="omfwd"
Expand Down Expand Up @@ -375,6 +381,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand Down Expand Up @@ -492,6 +499,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand Down
2 changes: 2 additions & 0 deletions tests/tests_combination.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand Down Expand Up @@ -311,6 +312,7 @@
#
# Ansible managed
#
# system_role:logging
ruleset(name="forwards_severity_and_facility") {
local1.info action(name="forwards_severity_and_facility"
type="omfwd"
Expand Down

0 comments on commit d1befca

Please sign in to comment.