Fix jinja2 white spaces issues reported by ansible-lint

This replaces double spaces by single spaces, fixes spaces in slices,
adds spaces before brackets and fixes bracket placing in when clauses.
This commit is contained in:
Thomas Woerner
2023-01-17 12:34:49 +01:00
parent d7c02d1347
commit d2f9fe6325
10 changed files with 70 additions and 72 deletions

View File

@@ -103,4 +103,4 @@
kdestroy -A -q -c idoverride_cache kdestroy -A -q -c idoverride_cache
when: when:
when: ipa_version is version("4.8.7", ">=") and trust_test_is_supported | default(false) when: ipa_version is version("4.8.7", ">=") and trust_test_is_supported | default(false)

View File

@@ -193,7 +193,7 @@
- "{{ hbacsvc_list[0] | upper }}" - "{{ hbacsvc_list[0] | upper }}"
- "{{ hbacsvc_list[1] | upper }}" - "{{ hbacsvc_list[1] | upper }}"
hbacsvcgroup: hbacsvcgroup:
- "{{ hbacsvcgroup_list[0] | upper }}" - "{{ hbacsvcgroup_list[0] | upper }}"
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed

View File

@@ -92,11 +92,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | lower }}" hostgroup: "hostgroup{{ item | lower }}"
host: "{{ item | lower }}.{{ ipaserver_domain }}" host: "{{ item | lower }}.{{ ipaserver_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
netgroup: "netgroup{{ item | lower }}" netgroup: "netgroup{{ item | lower }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
@@ -106,11 +106,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | upper }}" hostgroup: "hostgroup{{ item | upper }}"
host: "{{ item | upper }}.{{ ipaserver_domain }}" host: "{{ item | upper }}.{{ ipaserver_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
netgroup: "netgroup{{ item | upper }}" netgroup: "netgroup{{ item | upper }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
@@ -135,11 +135,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | lower }}" hostgroup: "hostgroup{{ item | lower }}"
host: "{{ item | lower }}.{{ ipaserver_domain }}" host: "{{ item | lower }}.{{ ipaserver_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
netgroup: "netgroup{{ item | lower }}" netgroup: "netgroup{{ item | lower }}"
action: member action: member
state: absent state: absent
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
@@ -150,11 +150,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | upper }}" hostgroup: "hostgroup{{ item | upper }}"
host: "{{ item | upper }}.{{ ipaserver_domain }}" host: "{{ item | upper }}.{{ ipaserver_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
netgroup: "netgroup{{ item | upper }}" netgroup: "netgroup{{ item | upper }}"
action: member action: member
state: absent state: absent
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
@@ -165,11 +165,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | upper }}" hostgroup: "hostgroup{{ item | upper }}"
host: "{{ item | upper }}.{{ ipaserver_domain }}" host: "{{ item | upper }}.{{ ipaserver_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
netgroup: "netgroup{{ item | upper }}" netgroup: "netgroup{{ item | upper }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
@@ -179,11 +179,11 @@
ipanetgroup: ipanetgroup:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "hostgroup{{ item | lower }}" hostgroup: "hostgroup{{ item | lower }}"
host: "{{ item | lower }}.{{ ipaserver_domain }}" host: "{{ item | lower }}.{{ ipaserver_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
netgroup: "netgroup{{ item | lower }}" netgroup: "netgroup{{ item | lower }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result

View File

@@ -247,7 +247,7 @@
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
- name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
ipapermission: ipapermission:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}" ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -259,7 +259,7 @@
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
ipapermission: ipapermission:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}" ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -271,7 +271,7 @@
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
- name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
ipapermission: ipapermission:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}" ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -284,7 +284,7 @@
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
ipapermission: ipapermission:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}" ipaapi_context: "{{ ipa_context | default(omit) }}"

View File

@@ -176,12 +176,10 @@
minlength: "" minlength: ""
register: result register: result
failed_when: failed_when:
result.changed or ( result.changed or
result.failed and not ( (result.failed and not
"an internal error has occurred" in result.msg ("an internal error has occurred" in result.msg or
or "int() argument must be" in result.msg "int() argument must be" in result.msg))
)
)
when: ipa_version is version("4.9", ">=") when: ipa_version is version("4.9", ">=")
- name: Ensure minlength is not cleared due to FreeIPA issue - name: Ensure minlength is not cleared due to FreeIPA issue

View File

@@ -88,7 +88,7 @@
KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all
kdestroy -A -q -c verify_sudocmdgroup kdestroy -A -q -c verify_sudocmdgroup
register: result register: result
failed_when: result.failed or not("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout) failed_when: result.failed or not ("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout)
- name: Ensure sudocmdgroup, with sudocmds, is absent - name: Ensure sudocmdgroup, with sudocmds, is absent
ipasudocmdgroup: ipasudocmdgroup:

View File

@@ -147,10 +147,10 @@
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
cmdcategory: all cmdcategory: all
hostgroup: "{{ item | lower }}" hostgroup: "{{ item | lower }}"
host: "{{ item | lower }}.{{ ipa_domain }}" host: "{{ item | lower }}.{{ ipa_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
failed_when: result.failed or result.changed failed_when: result.failed or result.changed
@@ -160,10 +160,10 @@
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
cmdcategory: all cmdcategory: all
hostgroup: "{{ item | upper }}" hostgroup: "{{ item | upper }}"
host: "{{ item | upper }}.{{ ipa_domain }}" host: "{{ item | upper }}.{{ ipa_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
failed_when: result.failed or result.changed failed_when: result.failed or result.changed
@@ -186,10 +186,10 @@
ipasudorule: ipasudorule:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "{{ item | lower }}" hostgroup: "{{ item | lower }}"
host: "{{ item | lower }}.{{ ipa_domain }}" host: "{{ item | lower }}.{{ ipa_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
action: member action: member
state: absent state: absent
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
@@ -200,10 +200,10 @@
ipasudorule: ipasudorule:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "{{ item | upper }}" hostgroup: "{{ item | upper }}"
host: "{{ item | upper }}.{{ ipa_domain }}" host: "{{ item | upper }}.{{ ipa_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
action: member action: member
state: absent state: absent
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
@@ -214,10 +214,10 @@
ipasudorule: ipasudorule:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "{{ item | upper }}" hostgroup: "{{ item | upper }}"
host: "{{ item | upper }}.{{ ipa_domain }}" host: "{{ item | upper }}.{{ ipa_domain }}"
group: "{{ item | upper }}" group: "{{ item | upper }}"
user: "user{{ item | upper }}" user: "user{{ item | upper }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result
@@ -227,10 +227,10 @@
ipasudorule: ipasudorule:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: "{{ item }}" name: "{{ item }}"
hostgroup: "{{ item | lower }}" hostgroup: "{{ item | lower }}"
host: "{{ item | lower }}.{{ ipa_domain }}" host: "{{ item | lower }}.{{ ipa_domain }}"
group: "{{ item | lower }}" group: "{{ item | lower }}"
user: "user{{ item | lower }}" user: "user{{ item | lower }}"
action: member action: member
loop: "{{ groups_present }}" loop: "{{ groups_present }}"
register: result register: result

View File

@@ -14,7 +14,7 @@
- name: Create dict with user names - name: Create dict with user names
ansible.builtin.set_fact: ansible.builtin.set_fact:
user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}" user_names: "{{ user_names | default([]) + [{'name': item.name}] }}"
loop: "{{ users }}" loop: "{{ users }}"
- name: Users absent len:{{ users | length }} - name: Users absent len:{{ users | length }}

View File

@@ -19,5 +19,5 @@
- name: Users present - name: Users present
ipauser: ipauser:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
users: "{{ users[item:item+slice_size] }}" users: "{{ users[item : item + slice_size] }}"
loop: "{{ range(0,users | length, slice_size) | list }}" loop: "{{ range(0, users | length, slice_size) | list }}"

View File

@@ -267,7 +267,7 @@
salt: MTIzNDU2Nzg5MDEyMzQ1Ngo= salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
new_password: SomeVAULTpassword new_password: SomeVAULTpassword
register: result register: result
failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
- name: Try to change symmetric vault salt, without providing `new_password` - name: Try to change symmetric vault salt, without providing `new_password`
ipavault: ipavault:
@@ -276,7 +276,7 @@
salt: MTIzNDU2Nzg5MDEyMzQ1Ngo= salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
password: SomeVAULTpassword password: SomeVAULTpassword
register: result register: result
failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
- name: Try to change symmetric vault salt, using wrong password. - name: Try to change symmetric vault salt, using wrong password.
ipavault: ipavault: