Skip to content

Commit

Permalink
Merge pull request freeipa#1195 from t-woerner/Fixes_for_ansible_lint…
Browse files Browse the repository at this point in the history
…_6_22_1

Fixes for ansible-lint 6.22.1
  • Loading branch information
rjeffman authored Dec 20, 2023
2 parents 3a304e8 + 47a1d50 commit 900c76e
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions playbooks/cert/cert-hold.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
- name: Certificate manage example
hosts: ipaserver
become: false
Expand Down
4 changes: 2 additions & 2 deletions tests/config/test_config_sid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
check_mode: yes
register: sid_disabled

- name: Ensure netbios_name can't be changed without SID enabled. # noqa 503
- name: Ensure netbios_name can't be changed without SID enabled. # noqa no-handler
ipaconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
Expand All @@ -39,7 +39,7 @@
failed_when: not result.failed and "SID generation must be enabled" in result.msg
when: sid_disabled.changed

- name: Ensure SIDs can't be changed without SID enabled. # noqa 503
- name: Ensure SIDs can't be changed without SID enabled. # noqa no-handler
ipaconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
Expand Down
2 changes: 1 addition & 1 deletion tests/dnsrecord/test_dnsrecord.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@
- name: Cleanup test environment.
ansible.builtin.include_tasks: env_cleanup.yml

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1]
become: no
Expand Down
2 changes: 1 addition & 1 deletion tests/group/test_group.yml
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
register: result
failed_when: result.changed or result.failed

# user
# user

- name: Ensure users user1, user2 and user3 are present in group group1
ipagroup:
Expand Down
2 changes: 1 addition & 1 deletion tests/group/test_groups_absent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
tasks:
- name: Include groups.json
ansible.builtin.include_vars:
file: groups.json # noqa 505
file: groups.json

- name: Initialize groups_names
ansible.builtin.set_fact:
Expand Down
2 changes: 1 addition & 1 deletion tests/group/test_groups_present.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
tasks:
- name: Include groups.json
ansible.builtin.include_vars:
file: groups.json # noqa 505
file: groups.json

- name: Groups present len:{{ group_list | length }}
ipagroup:
Expand Down
2 changes: 1 addition & 1 deletion tests/group/test_groups_present_slice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
tasks:
- name: Include groups.json
ansible.builtin.include_vars:
file: groups.json # noqa 505
file: groups.json

- name: Size of groups slice.
ansible.builtin.debug:
Expand Down
2 changes: 1 addition & 1 deletion tests/host/certificate/test_host_certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
register: result
failed_when: result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/host/certificate/test_hosts_certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/idoverrideuser/test_idoverrideuser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@
name: test_idview
state: absent

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/service/certificate/test_service_certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
update_dns: yes
state: absent

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [11, 12, 13, 21, 22, 23, 31, 32, 33]
Expand Down
2 changes: 1 addition & 1 deletion tests/service/test_service_disable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
- name: Destroy Kerberos tickets.
ansible.builtin.shell: kdestroy -A -q -c ${KRB5CCNAME}

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1]
Expand Down
2 changes: 1 addition & 1 deletion tests/user/certificate/test_user_certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/user/certificate/test_users_certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/user/certmapdata/test_user_certmapdata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/user/certmapdata/test_users_certmapdata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3]
Expand Down
2 changes: 1 addition & 1 deletion tests/user/test_users_invalid_cert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
register: result
failed_when: not result.changed or result.failed

- name: Remove certificate files. # noqa: deprecated-command-syntax
- name: Remove certificate files.
ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2]
Expand Down

0 comments on commit 900c76e

Please sign in to comment.