ansible-lint: Fix key order on upstream tests

In latest ansible-lint versions, the use of "blocks" has a required
order to be implemented. According to ansible-lint error mesage, the
order is name, when, block, rescue, always.

As not following this rule is now an error, this patch fixes all tests
for the 'key-order[task]' error.
This commit is contained in:
Rafael Guterres Jeffman
2023-02-20 16:02:56 -03:00
parent 0d1e9d3f49
commit c715d3aad2
18 changed files with 38 additions and 58 deletions

View File

@@ -31,6 +31,8 @@
failed_when: result.failed or not result.changed
- name: Change vault type from asymmetric to symmetric
vars:
krb5ccname: verify_change_from_asymmetric
block:
- name: Change from asymmetric to symmetric
ipavault:
@@ -50,10 +52,9 @@
register: result
failed_when: result.failed or "Public Key:" in result.stdout
vars:
krb5ccname: verify_change_from_asymmetric
- name: Change vault type from symmetric to standard
vars:
krb5ccname: verify_change_from_symmetric
block:
- name: Change from symmetric to standard
ipavault:
@@ -72,9 +73,6 @@
register: result
failed_when: result.failed or "Salt:" in result.stdout
vars:
krb5ccname: verify_change_from_symmetric
- name: Change from standard to symmetric
ipavault:
ipaadmin_password: SomeADMINpassword
@@ -85,6 +83,8 @@
failed_when: result.failed or not result.changed
- name: Change vault type from symmetric to asymmetric
vars:
krb5ccname: verify_change_from_symmetric
block:
- name: Change from symmetric to asymmetric
ipavault:
@@ -104,10 +104,9 @@
register: result
failed_when: result.failed or "Salt:" in result.stdout
vars:
krb5ccname: verify_change_from_symmetric
- name: Change vault type from asymmetric to standard
vars:
krb5ccname: verify_change_from_asymmetric
block:
- name: Change from asymmetric to standard
ipavault:
@@ -126,9 +125,6 @@
register: result
failed_when: result.failed or "Public Key:" in result.stdout
vars:
krb5ccname: verify_change_from_asymmetric
- name: Ensure test_vault is absent.
ipavault:
ipaadmin_password: SomeADMINpassword
@@ -161,6 +157,8 @@
failed_when: result.failed or result.changed or result.vault.data != 'hello'
- name: Change vault type from asymmetric to symmetric, with data
vars:
krb5ccname: verify_change_from_asymmetric
block:
- name: Change from asymmetric to symmetric, with data
ipavault:
@@ -180,9 +178,6 @@
register: result
failed_when: result.failed or "Public Key:" in result.stdout
vars:
krb5ccname: verify_change_from_asymmetric
- name: Retrieve data from symmetric vault.
ipavault:
ipaadmin_password: SomeADMINpassword
@@ -193,6 +188,8 @@
failed_when: result.failed or result.changed or result.vault.data != 'hello'
- name: Change vault type from symmetric to standard, with data
vars:
krb5ccname: verify_change_from_symmetric
block:
- name: Change from symmetric to standard, with data
ipavault:
@@ -211,9 +208,6 @@
register: result
failed_when: result.failed or "Salt:" in result.stdout
vars:
krb5ccname: verify_change_from_symmetric
- name: Retrieve data from standard vault.
ipavault:
ipaadmin_password: SomeADMINpassword
@@ -241,6 +235,8 @@
failed_when: result.failed or result.changed or result.vault.data != 'hello'
- name: Change vault type from symmetric to asymmetric, with data
vars:
krb5ccname: verify_change_from_symmetric
block:
- name: Change from symmetric to asymmetric, with data
ipavault:
@@ -260,9 +256,6 @@
register: result
failed_when: result.failed or "Salt:" in result.stdout
vars:
krb5ccname: verify_change_from_symmetric
- name: Retrieve data from asymmetric vault.
ipavault:
ipaadmin_password: SomeADMINpassword
@@ -273,6 +266,8 @@
failed_when: result.failed or result.changed or result.vault.data != 'hello'
- name: Change vault type from asymmetric to standard, with data
vars:
krb5ccname: verify_change_from_asymmetric
block:
- name: Change from asymmetric to standard, with data
ipavault:
@@ -291,9 +286,6 @@
register: result
failed_when: result.failed or "Public Key:" in result.stdout
vars:
krb5ccname: verify_change_from_asymmetric
- name: Retrieve data from standard vault.
ipavault:
ipaadmin_password: SomeADMINpassword