Merge pull request #1046 from rjeffman/fix_ansible_lint_tests

Fix ansible-lint on tests

tests/user/test_users_present_slice.yml

@@ -12,7 +12,7 @@
   tasks:
   - name: Include users.json
     ansible.builtin.include_vars:
-      file: users.json  # noqa 505
+      file: users.json  # noqa missing-import
   - name: Size of users slice.
     ansible.builtin.debug:
       msg: "{{ users | length }}"

tests/vault/test_vault_change_type.yml

@@ -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