diff --git a/.ansible-lint b/.ansible-lint index af177246f..03e343dd1 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -28,7 +28,6 @@ skip_list: - command-instead-of-module - command-instead-of-shell - deprecated-local-action - - jinja[spacing] - key-order[task] - name[play] - risky-file-permissions diff --git a/ansible/baremetal-compute-serial-console.yml b/ansible/baremetal-compute-serial-console.yml index 39acc3bd1..f4370f00a 100644 --- a/ansible/baremetal-compute-serial-console.yml +++ b/ansible/baremetal-compute-serial-console.yml @@ -38,7 +38,7 @@ set_fact: baremetal_nodes: >- {{ query('inventory_hostnames', console_compute_node_limit | - default('baremetal-compute') ) | unique }} + default('baremetal-compute')) | unique }} - name: Reserve TCP ports for ironic serial consoles include_role: @@ -110,7 +110,7 @@ vars: matching_nodes: >- {{ (nodes.stdout | from_json) | selectattr('Name', 'defined') | - selectattr('Name', 'equalto', inventory_hostname ) | list }} + selectattr('Name', 'equalto', inventory_hostname) | list }} node: "{{ matching_nodes | first }}" when: - cmd == "enable" @@ -130,7 +130,7 @@ vars: matching_nodes: >- {{ (nodes.stdout | from_json) | selectattr('Name', 'defined') | - selectattr('Name', 'equalto', inventory_hostname ) | list }} + selectattr('Name', 'equalto', inventory_hostname) | list }} node: "{{ matching_nodes | first }}" when: - cmd == "disable" diff --git a/ansible/roles/dnf/tasks/custom-repo.yml b/ansible/roles/dnf/tasks/custom-repo.yml index b7e66de76..6a7e0434e 100644 --- a/ansible/roles/dnf/tasks/custom-repo.yml +++ b/ansible/roles/dnf/tasks/custom-repo.yml @@ -3,28 +3,28 @@ yum_repository: name: "{{ item.key }}" description: "{% if 'description' in item.value %}{{ item.value.description }}{% else %}{{ item.key }} repository{% endif %}" - baseurl: "{{ item.value.baseurl | default(omit)}}" - file: "{{ item.value.file | default(omit)}}" - gpgkey: "{{ item.value.gpgkey | default(omit)}}" - gpgcheck: "{{ item.value.gpgcheck | default(omit)}}" - cost: "{{ item.value.cost | default(omit)}}" - enabled: "{{ item.value.enabled | default(omit)}}" - exclude: "{{ item.value.exclude | default(omit)}}" - gpgcakey: "{{ item.value.gpgcakey | default(omit)}}" - includepkgs: "{{ item.value.includepkgs | default(omit)}}" - metadata_expire: "{{ item.value.metadata_expire | default(omit)}}" - metalink: "{{ item.value.metalink | default(omit)}}" - mirrorlist: "{{ item.value.mirrorlist | default(omit)}}" - mirrorlist_expire: "{{ item.value.mirrorlist_expire | default(omit)}}" + baseurl: "{{ item.value.baseurl | default(omit) }}" + file: "{{ item.value.file | default(omit) }}" + gpgkey: "{{ item.value.gpgkey | default(omit) }}" + gpgcheck: "{{ item.value.gpgcheck | default(omit) }}" + cost: "{{ item.value.cost | default(omit) }}" + enabled: "{{ item.value.enabled | default(omit) }}" + exclude: "{{ item.value.exclude | default(omit) }}" + gpgcakey: "{{ item.value.gpgcakey | default(omit) }}" + includepkgs: "{{ item.value.includepkgs | default(omit) }}" + metadata_expire: "{{ item.value.metadata_expire | default(omit) }}" + metalink: "{{ item.value.metalink | default(omit) }}" + mirrorlist: "{{ item.value.mirrorlist | default(omit) }}" + mirrorlist_expire: "{{ item.value.mirrorlist_expire | default(omit) }}" password: "{{ item.value.password | default(omit) }}" - priority: "{{ item.value.priority | default(omit)}}" - proxy: "{{ item.value.proxy | default(omit)}}" - proxy_password: "{{ item.value.proxy_password | default(omit)}}" - proxy_username: "{{ item.value.proxy_username | default(omit)}}" - repo_gpgcheck: "{{ item.value.repo_gpgcheck | default(omit)}}" - sslverify: "{{ item.value.sslverify | default(omit)}}" + priority: "{{ item.value.priority | default(omit) }}" + proxy: "{{ item.value.proxy | default(omit) }}" + proxy_password: "{{ item.value.proxy_password | default(omit) }}" + proxy_username: "{{ item.value.proxy_username | default(omit) }}" + repo_gpgcheck: "{{ item.value.repo_gpgcheck | default(omit) }}" + sslverify: "{{ item.value.sslverify | default(omit) }}" username: "{{ item.value.username | default(omit) }}" - state: "{{ item.value.state | default(omit)}}" + state: "{{ item.value.state | default(omit) }}" with_dict: "{{ dnf_custom_repos }}" loop_control: label: "{{ item.key }}" diff --git a/ansible/roles/gather-facts-delegated/defaults/main.yml b/ansible/roles/gather-facts-delegated/defaults/main.yml index ad6fe6444..2bba8cfc4 100644 --- a/ansible/roles/gather-facts-delegated/defaults/main.yml +++ b/ansible/roles/gather-facts-delegated/defaults/main.yml @@ -4,5 +4,4 @@ gather_facts_delegated_batch_index: "{{ ansible_play_batch.index(inventory_hostn gather_facts_delegated_batch_count: "{{ ansible_play_batch | length }}" # Use a python list slice to divide the group up. # Syntax: [::] -gather_facts_delegated_delegate_hosts: >- - {{ gather_facts_delegated_limit_hosts[gather_facts_delegated_batch_index | int::gather_facts_delegated_batch_count | int] }} +gather_facts_delegated_delegate_hosts: "{{ gather_facts_delegated_limit_hosts[gather_facts_delegated_batch_index | int::gather_facts_delegated_batch_count | int] }}" # noqa jinja[spacing] diff --git a/ansible/roles/ipa-images/tasks/set-driver-info.yml b/ansible/roles/ipa-images/tasks/set-driver-info.yml index 4592da109..c2c11fcc9 100644 --- a/ansible/roles/ipa-images/tasks/set-driver-info.yml +++ b/ansible/roles/ipa-images/tasks/set-driver-info.yml @@ -23,9 +23,9 @@ - name: Change system scope to all for Ironic operations set_fact: ipa_images_ironic_openstack_auth_env: "{{ ipa_images_openstack_auth_env | - combine ({ 'OS_PROJECT_NAME': omit }) | - combine ({ 'OS_PROJECT_DOMAIN_NAME': omit }) | - combine ({ 'OS_SYSTEM_SCOPE': 'all' }) }}" + combine({'OS_PROJECT_NAME': omit}) | + combine({'OS_PROJECT_DOMAIN_NAME': omit}) | + combine({'OS_SYSTEM_SCOPE': 'all'}) }}" - name: Get a list of ironic nodes command: | diff --git a/ansible/roles/ssh-known-host/tasks/main.yml b/ansible/roles/ssh-known-host/tasks/main.yml index 2cb8cc49e..2f850a089 100644 --- a/ansible/roles/ssh-known-host/tasks/main.yml +++ b/ansible/roles/ssh-known-host/tasks/main.yml @@ -17,7 +17,7 @@ local_action: module: command ssh-keyscan {{ item }} with_items: - - "{{ ansible_host|default(inventory_hostname) }}" + - "{{ ansible_host | default(inventory_hostname) }}" register: keyscan_result changed_when: False