Configure yamllint to be compatible with ansible-lint

Current version of ansible-list pre-commit hook required changes in the
ansible-freeipa yamllint configuration and these changes triggered
issues in the current playbooks on roles and tests.

This patch adds the required changes to yaml lint configuration and
fixes the affected playbooks.

Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com>
This commit is contained in:
Rafael Guterres Jeffman
2025-01-28 15:20:09 -03:00
parent 9195494f37
commit 91c4b83311
27 changed files with 78 additions and 85 deletions

View File

@@ -20,4 +20,9 @@ rules:
max: 160 max: 160
# Disabled rules # Disabled rules
indentation: disable indentation: disable
comments: disable comments:
min-spaces-from-content: 1
comments-indentation: disable
octal-values:
forbid-implicit-octal: true
forbid-explicit-octal: true

View File

@@ -21,7 +21,7 @@
- ip_address: 8.8.8.8 - ip_address: 8.8.8.8
- ip_address: 8.8.4.4 - ip_address: 8.8.4.4
port: 52 port: 52
#serial: 1234 # serial: 1234
refresh: 3600 refresh: 3600
retry: 900 retry: 900
expire: 1209600 expire: 1209600

View File

@@ -11,7 +11,7 @@
dest: "{{ ansible_facts['env'].HOME }}/password.txt" dest: "{{ ansible_facts['env'].HOME }}/password.txt"
owner: "{{ ansible_user }}" owner: "{{ ansible_user }}"
group: "{{ ansible_user }}" group: "{{ ansible_user }}"
mode: 0600 mode: "0600"
- name: Ensure symmetric vault exists with password from file. - name: Ensure symmetric vault exists with password from file.
ipavault: ipavault:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword

View File

@@ -16,7 +16,7 @@
dest: "{{ ansible_facts['env'].HOME }}/public.pem" dest: "{{ ansible_facts['env'].HOME }}/public.pem"
owner: "{{ ansible_user }}" owner: "{{ ansible_user }}"
group: "{{ ansible_user }}" group: "{{ ansible_user }}"
mode: 0600 mode: "0600"
- name: Ensure asymmetric vault exists with public key from file. - name: Ensure asymmetric vault exists with public key from file.
ipavault: ipavault:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword

View File

@@ -152,7 +152,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: "{{ ipaadmin_keytab }}" src: "{{ ipaadmin_keytab }}"
dest: "{{ keytab_temp.path }}" dest: "{{ keytab_temp.path }}"
mode: 0600 mode: "0600"
delegate_to: "{{ result_ipaclient_test.servers[0] }}" delegate_to: "{{ result_ipaclient_test.servers[0] }}"
when: ipaadmin_keytab is defined when: ipaadmin_keytab is defined

View File

@@ -15,8 +15,3 @@
ipaclient_configure_dns_resolver: ipaclient_configure_dns_resolver:
state: absent state: absent
when: ipaclient_cleanup_dns_resolver | bool when: ipaclient_cleanup_dns_resolver | bool
#- name: Remove IPA client package
# ansible.builtin.package:
# name: "{{ ipaclient_packages }}"
# state: absent

View File

@@ -2,4 +2,4 @@
# vars/Fedora-25.yml # vars/Fedora-25.yml
--- ---
ipaclient_packages: [ "ipa-client", "libselinux-python" ] ipaclient_packages: [ "ipa-client", "libselinux-python" ]
#ansible_python_interpreter: '/usr/bin/python2' # ansible_python_interpreter: '/usr/bin/python2'

View File

@@ -2,4 +2,4 @@
# vars/Fedora-26.yml # vars/Fedora-26.yml
--- ---
ipaclient_packages: [ "ipa-client", "libselinux-python" ] ipaclient_packages: [ "ipa-client", "libselinux-python" ]
#ansible_python_interpreter: '/usr/bin/python2' # ansible_python_interpreter: '/usr/bin/python2'

View File

@@ -2,4 +2,4 @@
# vars/RedHat-7.3.yml # vars/RedHat-7.3.yml
--- ---
ipaclient_packages: [ "ipa-client", "ipa-admintools", "libselinux-python" ] ipaclient_packages: [ "ipa-client", "ipa-admintools", "libselinux-python" ]
#ansible_python_interpreter: '/usr/bin/python2' # ansible_python_interpreter: '/usr/bin/python2'

View File

@@ -2,4 +2,3 @@
# vars/RedHat-7 # vars/RedHat-7
--- ---
ipaclient_packages: [ "ipa-client", "libselinux-python" ] ipaclient_packages: [ "ipa-client", "libselinux-python" ]
#ansible_python_interpreter: '/usr/bin/python2'

View File

@@ -2,4 +2,3 @@
# vars/default.yml # vars/default.yml
--- ---
ipaclient_packages: [ "ipa-client", "python3-libselinux" ] ipaclient_packages: [ "ipa-client", "python3-libselinux" ]
#ansible_python_interpreter: '/usr/bin/python3'

View File

@@ -17,10 +17,10 @@ ipareplica_no_ui_redirect: no
ipaclient_mkhomedir: no ipaclient_mkhomedir: no
ipaclient_force_join: no ipaclient_force_join: no
ipaclient_no_ntp: no ipaclient_no_ntp: no
#ipaclient_ssh_trust_dns: no # ipaclient_ssh_trust_dns: no
#ipaclient_no_ssh: no # ipaclient_no_ssh: no
#ipaclient_no_sshd: no # ipaclient_no_sshd: no
#ipaclient_no_dns_sshfp: no # ipaclient_no_dns_sshfp: no
ipaclient_ssh_trust_dns: no ipaclient_ssh_trust_dns: no
### certificate system ### ### certificate system ###
ipareplica_skip_schema_check: no ipareplica_skip_schema_check: no

View File

@@ -16,10 +16,10 @@ ipaserver_random_serial_numbers: false
### client ### ### client ###
ipaclient_mkhomedir: no ipaclient_mkhomedir: no
ipaclient_no_ntp: no ipaclient_no_ntp: no
#ipaclient_ssh_trust_dns: no # ipaclient_ssh_trust_dns: no
#ipaclient_no_ssh: no # ipaclient_no_ssh: no
#ipaclient_no_sshd: no # ipaclient_no_sshd: no
#ipaclient_no_dns_sshfp: no # ipaclient_no_dns_sshfp: no
### certificate system ### ### certificate system ###
ipaserver_external_ca: no ipaserver_external_ca: no
### dns ### ### dns ###

View File

@@ -54,8 +54,3 @@
# 1 means that uninstall failed because IPA server was not configured # 1 means that uninstall failed because IPA server was not configured
failed_when: uninstall.rc != 0 and uninstall.rc != 1 failed_when: uninstall.rc != 0 and uninstall.rc != 1
changed_when: uninstall.rc == 0 changed_when: uninstall.rc == 0
#- name: Remove IPA server packages
# ansible.builtin.package:
# name: "{{ ipaserver_packages }}"
# state: absent

View File

@@ -109,7 +109,7 @@
ansible.builtin.file: ansible.builtin.file:
path: /etc/sssd/pki path: /etc/sssd/pki
state: directory state: directory
mode: 0711 mode: "0711"
- name: Ensure /etc/sssd/pki/sssd_auth_ca_db.pem is absent - name: Ensure /etc/sssd/pki/sssd_auth_ca_db.pem is absent
ansible.builtin.file: ansible.builtin.file:

View File

@@ -201,7 +201,7 @@
ansible.builtin.file: ansible.builtin.file:
path: /etc/sssd/pki path: /etc/sssd/pki
state: directory state: directory
mode: 0711 mode: "0711"
- name: Ensure /etc/sssd/pki/sssd_auth_ca_db.pem is absent - name: Ensure /etc/sssd/pki/sssd_auth_ca_db.pem is absent
ansible.builtin.file: ansible.builtin.file:

View File

@@ -48,7 +48,7 @@
ansible.builtin.file: ansible.builtin.file:
path: "/root/ca-less-test" path: "/root/ca-less-test"
state: directory state: directory
mode: 0775 mode: "0775"
- name: Copy CA certificate - name: Copy CA certificate
ansible.builtin.copy: ansible.builtin.copy:

View File

@@ -48,7 +48,7 @@
ansible.builtin.file: ansible.builtin.file:
path: "/root/ca-less-test" path: "/root/ca-less-test"
state: directory state: directory
mode: 0775 mode: "0775"
- name: Copy CA certificate - name: Copy CA certificate
ansible.builtin.copy: ansible.builtin.copy:

View File

@@ -47,7 +47,7 @@
ansible.builtin.copy: ansible.builtin.copy:
dest: "/root/host.csr" dest: "/root/host.csr"
content: "{{ host_req.stdout }}" content: "{{ host_req.stdout }}"
mode: 0644 mode: "0644"
# TESTS # TESTS

View File

@@ -45,7 +45,7 @@
ansible.builtin.copy: ansible.builtin.copy:
dest: "/root/user.csr" dest: "/root/user.csr"
content: "{{ user_req.stdout }}" content: "{{ user_req.stdout }}"
mode: 0644 mode: "0644"
# TESTS # TESTS

View File

@@ -28,7 +28,7 @@
become: true become: true
vars: vars:
ipaserver_external_cert_files_from_controller: "{{ groups.ipaserver[0] + '-chain.crt' }}" ipaserver_external_cert_files_from_controller: "{{ groups.ipaserver[0] + '-chain.crt' }}"
#ipaserver_external_ca_file: "{{ groups.ipaserver[0] + '-cacert.asc' }}" # ipaserver_external_ca_file: "{{ groups.ipaserver[0] + '-cacert.asc' }}"
roles: roles:
- role: ipaserver - role: ipaserver

View File

@@ -34,7 +34,7 @@
become: true become: true
vars: vars:
ipaserver_external_cert_files: "/root/chain.crt" ipaserver_external_cert_files: "/root/chain.crt"
#ipaserver_external_ca_file: "cacert.asc" # ipaserver_external_ca_file: "cacert.asc"
pre_tasks: pre_tasks:
- name: Copy "{{ groups.ipaserver[0] + '-chain.crt' }}" to /root/chain.crt on node - name: Copy "{{ groups.ipaserver[0] + '-chain.crt' }}" to /root/chain.crt on node

View File

@@ -298,11 +298,11 @@
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
#- ipagroup: # - ipagroup:
# name: group1 # name: group1
# user: # user:
# - user7 # - user7
# action: member # action: member
- name: Ensure user user7 is absent in group group1 - name: Ensure user user7 is absent in group group1
ipagroup: ipagroup:

View File

@@ -191,35 +191,35 @@
# disabled can only be checked with enabled hosts, all hosts above are # disabled can only be checked with enabled hosts, all hosts above are
# not enabled. # not enabled.
#- name: Hosts host1..host6 disabled # - name: Hosts host1..host6 disabled
# ipahost: # ipahost:
# ipaadmin_password: SomeADMINpassword # ipaadmin_password: SomeADMINpassword
# ipaapi_context: "{{ ipa_context | default(omit) }}" # ipaapi_context: "{{ ipa_context | default(omit) }}"
# name: # name:
# - "{{ host1_fqdn }}" # - "{{ host1_fqdn }}"
# - "{{ host2_fqdn }}" # - "{{ host2_fqdn }}"
# - "{{ host3_fqdn }}" # - "{{ host3_fqdn }}"
# - "{{ host4_fqdn }}" # - "{{ host4_fqdn }}"
# - "{{ host5_fqdn }}" # - "{{ host5_fqdn }}"
# - "{{ host6_fqdn }}" # - "{{ host6_fqdn }}"
# state: disabled # state: disabled
# register: result # register: result
# failed_when: not result.changed or result.failed # failed_when: not result.changed or result.failed
# #
#- name: Hosts host1..host6 disabled again # - name: Hosts host1..host6 disabled again
# ipahost: # ipahost:
# ipaadmin_password: SomeADMINpassword # ipaadmin_password: SomeADMINpassword
# ipaapi_context: "{{ ipa_context | default(omit) }}" # ipaapi_context: "{{ ipa_context | default(omit) }}"
# name: # name:
# - "{{ host1_fqdn }}" # - "{{ host1_fqdn }}"
# - "{{ host2_fqdn }}" # - "{{ host2_fqdn }}"
# - "{{ host3_fqdn }}" # - "{{ host3_fqdn }}"
# - "{{ host4_fqdn }}" # - "{{ host4_fqdn }}"
# - "{{ host5_fqdn }}" # - "{{ host5_fqdn }}"
# - "{{ host6_fqdn }}" # - "{{ host6_fqdn }}"
# state: disabled # state: disabled
# register: result # register: result
# failed_when: result.changed or result.failed # failed_when: result.changed or result.failed
- name: Hosts host1..host6 absent - name: Hosts host1..host6 absent
ipahost: ipahost:

View File

@@ -56,7 +56,7 @@
first: pinky first: pinky
last: Acme last: Acme
initials: pa initials: pa
#password: foo2 # password: foo2
principal: pa principal: pa
random: yes random: yes
street: PinkyStreet street: PinkyStreet
@@ -73,8 +73,8 @@
# sshpubkey # sshpubkey
userauthtype: password,radius,otp userauthtype: password,radius,otp
userclass: PinkyUserClass userclass: PinkyUserClass
#radius: "http://some.link/" # radius: "http://some.link/"
#radiususer: PinkyRadiusUser # radiususer: PinkyRadiusUser
departmentnumber: "1234" departmentnumber: "1234"
employeenumber: "0815" employeenumber: "0815"
employeetype: "PinkyExmployeeType" employeetype: "PinkyExmployeeType"
@@ -82,8 +82,8 @@
# certificate # certificate
noprivate: yes noprivate: yes
nomembers: false nomembers: false
#issuer: PinkyIssuer # issuer: PinkyIssuer
#subject: PinkySubject # subject: PinkySubject
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed

View File

@@ -190,7 +190,7 @@
first: pinky first: pinky
last: Acme last: Acme
initials: pa initials: pa
#password: foo2 # password: foo2
principal: pa principal: pa
random: yes random: yes
street: PinkyStreet street: PinkyStreet
@@ -207,8 +207,8 @@
# sshpubkey # sshpubkey
userauthtype: password,radius,otp userauthtype: password,radius,otp
userclass: PinkyUserClass userclass: PinkyUserClass
#radius: "http://some.link/" # radius: "http://some.link/"
#radiususer: PinkyRadiusUser # radiususer: PinkyRadiusUser
departmentnumber: "1234" departmentnumber: "1234"
employeenumber: "0815" employeenumber: "0815"
employeetype: "PinkyExmployeeType" employeetype: "PinkyExmployeeType"
@@ -216,8 +216,8 @@
# certificate # certificate
noprivate: yes noprivate: yes
nomembers: false nomembers: false
#issuer: PinkyIssuer # issuer: PinkyIssuer
#subject: PinkySubject # subject: PinkySubject
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
@@ -234,7 +234,7 @@
first: pinky first: pinky
last: Acme last: Acme
initials: pa initials: pa
#password: foo2 # password: foo2
principal: pa principal: pa
random: yes random: yes
street: PinkyStreet street: PinkyStreet
@@ -251,8 +251,8 @@
# sshpubkey # sshpubkey
userauthtype: password,radius,otp userauthtype: password,radius,otp
userclass: PinkyUserClass userclass: PinkyUserClass
#radius: "http://some.link/" # radius: "http://some.link/"
#radiususer: PinkyRadiusUser # radiususer: PinkyRadiusUser
departmentnumber: "1234" departmentnumber: "1234"
employeenumber: "0815" employeenumber: "0815"
employeetype: "PinkyExmployeeType" employeetype: "PinkyExmployeeType"
@@ -260,8 +260,8 @@
# certificate # certificate
noprivate: yes noprivate: yes
nomembers: false nomembers: false
#issuer: PinkyIssuer # issuer: PinkyIssuer
#subject: PinkySubject # subject: PinkySubject
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed

View File

@@ -20,7 +20,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: "{{ playbook_dir }}/{{ item }}" src: "{{ playbook_dir }}/{{ item }}"
dest: "{{ ansible_facts['env'].HOME }}/{{ item }}" dest: "{{ ansible_facts['env'].HOME }}/{{ item }}"
mode: 0644 mode: "0644"
with_items: with_items:
- A_private.pem - A_private.pem
- A_public.pem - A_public.pem