ansible-lint: Fix var-naming warnings

Signed-off-by: Wen Liang <liangwen12year@gmail.com>
This commit is contained in:
Wen Liang 2023-02-28 15:16:31 -05:00 committed by Fernando Fernández Mancera
parent 47898bab1f
commit f11e720268
10 changed files with 23 additions and 23 deletions

View file

@ -18,7 +18,7 @@ GET_NM_VERSION = """
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -27,7 +27,7 @@ GET_NM_VERSION = """
"""
MINIMUM_NM_VERSION_CHECK = """
- NetworkManager_version.stdout is version({minimum_nm_version}, '>=')
- networkmanager_version.stdout is version({minimum_nm_version}, '>=')
"""
EXTRA_RUN_CONDITION_PREFIX = " - "

View file

@ -176,7 +176,7 @@
- name: Check if `/etc/resolv.conf` is generated by NM
command: grep "Generated by NetworkManager" /etc/resolv.conf
register: generateByNM
register: generate_by_nm
ignore_errors: true # noqa ignore-errors
changed_when: false
@ -195,7 +195,7 @@
- resolvconf.stdout is not search("example.com") and
resolvconf.stdout is not search("example.org") and
resolvconf.stdout is not search("2001:4860:4860::8888") or
generateByNM.stdout | length == 0
generate_by_nm.stdout | length == 0
msg: the file `/etc/resolv.conf` contains the specified DNS
configuration

View file

@ -4,15 +4,15 @@
- name: Get NetworkManager RPM version
command:
cmd: rpm -qa --qf '%{name}-%{version}-%{release}\n' NetworkManager
register: __rpm_q_NetworkManager
register: __rpm_q_networkmanager
- name: Store NetworkManager version
set_fact:
NetworkManager_NVR: "{{ __rpm_q_NetworkManager.stdout }}"
networkmanager_nvr: "{{ __rpm_q_networkmanager.stdout }}"
- name: Show NetworkManager version
debug:
var: NetworkManager_NVR
var: networkmanager_nvr
tags:
- always
...

View file

@ -46,7 +46,7 @@
- name: Get NetworkManager version
command:
cmd: rpm -qa NetworkManager
register: __network_NM_NVR
register: __network_nm_nvr
changed_when: false
- block:
- name: Import network role
@ -83,20 +83,20 @@
with_items:
- ansible_failed_result
- ansible_failed_task
- __network_NM_NVR.stdout
- __network_nm_nvr.stdout
- __NM_capath_ignored_NVRs
changed_when: false
- name: Assert role behavior
vars:
expected_failure: __network_NM_NVR.stdout in __NM_capath_ignored_NVRs
expected_failure: __network_nm_nvr.stdout in __NM_capath_ignored_NVRs
failure: __network_connections_result.failed
assert:
that: (failure and expected_failure) or
(not failure and not expected_failure)
msg: "Role {{ failure and 'failed' or 'did not fail' }} but was expected
{{ expected_failure and '' or 'not' }} to fail.
NM NVR: {{ __network_NM_NVR.stdout }}"
NM NVR: {{ __network_nm_nvr.stdout }}"
- name: Assert role failure
assert:
that: "

View file

@ -19,7 +19,7 @@
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -34,4 +34,4 @@
when:
- ansible_distribution_major_version != '6'
- NetworkManager_version.stdout is version('1.26.0', '>=')
- networkmanager_version.stdout is version('1.26.0', '>=')

View file

@ -19,7 +19,7 @@
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -34,4 +34,4 @@
when:
- ansible_distribution_major_version != '6'
- NetworkManager_version.stdout is version('1.25.1', '>=')
- networkmanager_version.stdout is version('1.25.1', '>=')

View file

@ -19,7 +19,7 @@
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -34,4 +34,4 @@
when:
- ansible_distribution_major_version != '6'
- NetworkManager_version.stdout is version('1.20.0', '>=')
- networkmanager_version.stdout is version('1.20.0', '>=')

View file

@ -19,7 +19,7 @@
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -34,4 +34,4 @@
when:
- ansible_distribution_major_version != '6'
- NetworkManager_version.stdout is version('1.25.2', '>=')
- networkmanager_version.stdout is version('1.25.2', '>=')

View file

@ -19,7 +19,7 @@
state: present
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
register: NetworkManager_version
register: networkmanager_version
when: true
when:
- ansible_distribution_major_version != '6'
@ -34,6 +34,6 @@
when:
- ansible_distribution_major_version != '6'
- NetworkManager_version.stdout is version('1.20.0', '>=')
- networkmanager_version.stdout is version('1.20.0', '>=')
- ansible_distribution != 'RedHat' or
ansible_distribution_major_version | int < 9

View file

@ -15,7 +15,7 @@
- name: Get NetworkManager version
command: rpm -q --qf "%{version}" NetworkManager
when: true
register: NetworkManager_version
register: networkmanager_version
# workaround for: https://github.com/ansible/ansible/issues/27973
# There is no way in Ansible to abort a playbook hosts with specific OS
@ -26,6 +26,6 @@
when:
- ansible_distribution_major_version != '6'
# The test depends on behavior that is only visible with newer NM
- NetworkManager_version.stdout is version('1.22.0', '>=')
- networkmanager_version.stdout is version('1.22.0', '>=')
- ansible_distribution != 'RedHat' or
ansible_distribution_major_version | int < 9