From c2048a7148fa37e4e3a3a1cb77ca83e3791dc2f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 13 Feb 2025 09:11:53 +0100 Subject: [PATCH] Auto-fix yaml rules In order to reduce divergance with ansible-lint rules, we apply auto-fixing of violations. In current patch we replace all kind of truthy variables with `true` or `false` values to align with recommendations along with alignment of used quotes. Change-Id: I9ddc816b49957aba9389c9712afd7d1bb02bd927 --- .gitignore | 1 + requirements.yml | 12 ++++++------ tasks/main.yml | 16 ++++++++-------- vars/debian-12.yml | 4 ++-- vars/debian.yml | 4 ++-- vars/redhat-9.yml | 4 ++-- vars/ubuntu-24.yml | 4 ++-- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 3a77206..c46a9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ logs/* # OS generated files # ###################### ._* +.ansible .tox *.egg-info .eggs diff --git a/requirements.yml b/requirements.yml index b353649..0c31e9d 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,8 +1,8 @@ --- collections: -- name: https://opendev.org/openstack/ansible-config_template - version: master - type: git -- name: https://github.com/ansible-collections/ansible.utils - version: main - type: git + - name: https://opendev.org/openstack/ansible-config_template + version: master + type: git + - name: https://github.com/ansible-collections/ansible.utils + version: main + type: git diff --git a/tasks/main.yml b/tasks/main.yml index 5ca5289..707594c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,7 +25,7 @@ - "{{ ansible_facts['os_family'] | lower }}.yml" paths: - "{{ role_path }}/vars" - skip: true # skip if no files are found + skip: true # skip if no files are found tags: - always @@ -39,7 +39,7 @@ copy: src: "{{ item.keyfile }}" dest: "{{ item.key }}" - mode: '0644' + mode: "0644" with_items: "{{ systemd_networkd_package_repos_keys | selectattr('keyfile', 'defined') | list }}" when: - ansible_facts['os_family'] | lower == 'redhat' @@ -72,12 +72,12 @@ yum_repository: name: epel-networkd baseurl: "{{ systemd_networkd_epel_mirror ~ '/' ~ ansible_facts['distribution_major_version'] ~ '/Everything/' ~ ansible_facts['architecture'] }}" - description: 'Extra Packages for Enterprise Linux $releasever - $basearch' + description: "Extra Packages for Enterprise Linux $releasever - $basearch" gpgkey: "file://{{ systemd_networkd_package_repos_keys[0].key }}" - gpgcheck: yes - enabled: yes + gpgcheck: true + enabled: true state: present - includepkgs: 'systemd-networkd' + includepkgs: "systemd-networkd" when: - ansible_facts['os_family'] | lower == 'redhat' register: install_epel_repo @@ -255,9 +255,9 @@ sysctl: name: "net.ipv4.conf.{{ item.1.interface }}.forwarding" value: 1 - sysctl_set: yes + sysctl_set: true state: present - reload: yes + reload: true with_indexed_items: "{{ _systemd_networks_named }}" when: - (ansible_facts['os_family'] | lower) == 'redhat' diff --git a/vars/debian-12.yml b/vars/debian-12.yml index 0aa38cb..9dc9498 100644 --- a/vars/debian-12.yml +++ b/vars/debian-12.yml @@ -14,9 +14,9 @@ # limitations under the License. _systemd_networkd_distro_packages: - - dbus # Needed for networkctl + - dbus # Needed for networkctl - "{{ systemd_resolved_available | ternary('systemd-resolved', '') }}" - - udev # Needed for networkd to bring interfaces up + - udev # Needed for networkd to bring interfaces up _systemd_resolved_available: false diff --git a/vars/debian.yml b/vars/debian.yml index 5dd7530..828d539 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -14,8 +14,8 @@ # limitations under the License. _systemd_networkd_distro_packages: - - dbus # Needed for networkctl - - udev # Needed for networkd to bring interfaces up + - dbus # Needed for networkctl + - udev # Needed for networkd to bring interfaces up _systemd_resolved_available: true diff --git a/vars/redhat-9.yml b/vars/redhat-9.yml index 992b10f..50fd269 100644 --- a/vars/redhat-9.yml +++ b/vars/redhat-9.yml @@ -14,10 +14,10 @@ # limitations under the License. _systemd_networkd_distro_packages: - - dbus # Needed for networkctl + - dbus # Needed for networkctl - systemd-networkd - "{{ systemd_resolved_available | ternary('systemd-resolved', '') }}" - - systemd-udev # Needed for networkd to bring interfaces up + - systemd-udev # Needed for networkd to bring interfaces up _systemd_resolved_available: false diff --git a/vars/ubuntu-24.yml b/vars/ubuntu-24.yml index 8243d51..a20af64 100644 --- a/vars/ubuntu-24.yml +++ b/vars/ubuntu-24.yml @@ -14,9 +14,9 @@ # limitations under the License. _systemd_networkd_distro_packages: - - dbus # Needed for networkctl + - dbus # Needed for networkctl - "{{ systemd_resolved_available | ternary('systemd-resolved', '') }}" - - udev # Needed for networkd to bring interfaces up + - udev # Needed for networkd to bring interfaces up _systemd_resolved_available: true