ansible-lint: fix key order, jinja spacing, task names

Author: markgoddard

.ansible-lint

@@ -1,8 +1,5 @@
 ---
 skip_list:
-  - key-order[task]
-  - jinja[spacing]
-  - name[missing]
   - var-naming[no-role-prefix]
   - yaml[octal-values]
   - yaml[trailing-spaces]

roles/vault/tasks/vault.yml

@@ -26,6 +26,9 @@
   until: vault_init_status.status == 200
 
 - name: "Initialize vault"
+  run_once: true
+  when:
+    - not vault_init_status.json.initialized
   block:
     - name: Initialize vault
       hashivault_init:
@@ -54,6 +57,3 @@
       delegate_to: "{{ vault_write_keys_file_host }}"
       when:
         - vault_write_keys_file | bool
-  run_once: true
-  when:
-    - not vault_init_status.json.initialized

roles/vault_pki/tasks/intermediate.yml

@@ -12,6 +12,7 @@
       max_lease_ttl: "{{ vault_pki_intermediate_max_lease_ttl }}"
 
 - name: "Generate Intermediate CA cert, key and sign CSR"
+  when: not vault_pki_intermediate_import | bool
   block:
     - name: "Generate Vault Intermediate CA cert and key"
       hashivault_pki_ca:
@@ -93,9 +94,9 @@
         - intermediate_ca_csr.data is defined
         - intermediate_ca_csr_signed.data is defined
 
-  when: not vault_pki_intermediate_import | bool
 
 - name: "Import Intermediate CA cert and key"
+  when: vault_pki_intermediate_import | bool
   block:
     - name: "Import Intermediate CA cert and key"
       hashivault_pki_ca_set:
@@ -104,5 +105,3 @@
         ca_cert: "{{ vault_ca_cert | default(omit) }}"
         mount_point: "{{ vault_pki_intermediate_ca_name }}"
         pem_bundle: "{{ vault_pki_intermediate_ca_bundle }}"
-
-  when: vault_pki_intermediate_import | bool

tests/test_vault.yml

@@ -15,11 +15,12 @@
         state: directory
       become: true
 
-    - include_role:
+    - name: Include vault role
+      include_role:
         name: vault
 
-    # Idempotence test
-    - include_role:
+    - name: Include vault role (idemoptence test)
+      include_role:
         name: vault
 
     - name: Unseal vault