diff --git a/playbooks/vault/retrive-data-asymmetric-vault.yml b/playbooks/vault/retrive-data-asymmetric-vault.yml index 35472d20addde667bd1011b289422e79bd818d13..89359872aea98b39a94c520ef1dcdeb76a36f18a 100644 --- a/playbooks/vault/retrive-data-asymmetric-vault.yml +++ b/playbooks/vault/retrive-data-asymmetric-vault.yml @@ -15,5 +15,5 @@ register: result no_log: true - name: Display retrieved data. - debug: + ansible.builtin.debug: msg: "Data: {{ result.vault.data }}" diff --git a/playbooks/vault/retrive-data-symmetric-vault.yml b/playbooks/vault/retrive-data-symmetric-vault.yml index 98902a1bcb4f44d2ee8d666555476340fe9eaf7f..a415d33dc25ac7181a6527bff8cc1c7f81802f34 100644 --- a/playbooks/vault/retrive-data-symmetric-vault.yml +++ b/playbooks/vault/retrive-data-symmetric-vault.yml @@ -15,5 +15,5 @@ register: result no_log: true - name: Display retrieved data. - debug: + ansible.builtin.debug: msg: "Data: {{ result.vault.data }}" diff --git a/playbooks/vault/vault-is-present-with-password-file.yml b/playbooks/vault/vault-is-present-with-password-file.yml index c92e2a6bfcd7ba93429ddad589817776ab416eaa..aa1700ce04806ca4a66356a515da32eb6ba5964b 100644 --- a/playbooks/vault/vault-is-present-with-password-file.yml +++ b/playbooks/vault/vault-is-present-with-password-file.yml @@ -6,7 +6,7 @@ tasks: - name: Copy file containing password to server. - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/password.txt" dest: "{{ ansible_facts['env'].HOME }}/password.txt" owner: "{{ ansible_user }}" @@ -20,6 +20,6 @@ vault_type: symmetric vault_password_file: "{{ ansible_facts['env'].HOME }}/password.txt" - name: Remove file containing password from server. - file: + ansible.builtin.file: path: "{{ ansible_facts['env'].HOME }}/password.txt" state: absent diff --git a/playbooks/vault/vault-is-present-with-public-key-file.yml b/playbooks/vault/vault-is-present-with-public-key-file.yml index cd1e7597cf1b8d0d6ac09772bc76023cf19d54a1..fbd6d7d98ffd9266c98fbdf0ccd4bfa70ec04695 100644 --- a/playbooks/vault/vault-is-present-with-public-key-file.yml +++ b/playbooks/vault/vault-is-present-with-public-key-file.yml @@ -11,7 +11,7 @@ tasks: - name: Copy public key file to server. - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/public.pem" dest: "{{ ansible_facts['env'].HOME }}/public.pem" owner: "{{ ansible_user }}" @@ -25,6 +25,6 @@ vault_type: asymmetric vault_public_key_file: "{{ ansible_facts['env'].HOME }}/public.pem" - name: Remove public key file from server. - file: + ansible.builtin.file: path: "{{ ansible_facts['env'].HOME }}/public.pem" state: absent diff --git a/tests/vault/env_cleanup.yml b/tests/vault/env_cleanup.yml index 85f4d10c9e9d6eb912295aaeb5766ffd538e71f6..c91ae40981f71631f4015000026ee2e409697941 100644 --- a/tests/vault/env_cleanup.yml +++ b/tests/vault/env_cleanup.yml @@ -41,7 +41,7 @@ state: absent - name: Remove files from target host. - file: + ansible.builtin.file: path: "{{ ansible_facts['env'].HOME }}/{{ item }}" state: absent with_items: @@ -58,7 +58,7 @@ - out.txt - name: Remove files from controller. - file: + ansible.builtin.file: path: "{{ playbook_dir }}/{{ item }}" state: absent delegate_to: localhost diff --git a/tests/vault/env_setup.yml b/tests/vault/env_setup.yml index 69e9cb71589cf49707e549bdc8e432b6f1405b5c..a122454998cf367a3d3d32ef8e5508163c43fcdd 100644 --- a/tests/vault/env_setup.yml +++ b/tests/vault/env_setup.yml @@ -1,10 +1,10 @@ --- # Tasks executed to ensure a sane environment to test IPA Vault module. - name: Ensure environment is clean. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml - name: Create private/public key pair. - shell: + ansible.builtin.shell: cmd: | openssl genrsa -out "{{ item }}private.pem" 2048 openssl rsa -in "{{ item }}private.pem" -outform PEM -pubout -out "{{ item }}public.pem" @@ -17,7 +17,7 @@ - B_ - name: Copy files to target host. - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/{{ item }}" dest: "{{ ansible_facts['env'].HOME }}/{{ item }}" mode: 0644 diff --git a/tests/vault/tasks_vault_members.yml b/tests/vault/tasks_vault_members.yml index d3af934727fc20c5e75b36eb518c6e11fdcd9404..a68d5aac2d82749cdd12300052cbe28010c8ab3b 100644 --- a/tests/vault/tasks_vault_members.yml +++ b/tests/vault/tasks_vault_members.yml @@ -1,7 +1,7 @@ --- # Tasks to test member management for Vault module. - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml - name: Ensure vault is present ipavault: @@ -315,4 +315,4 @@ failed_when: result.changed or result.failed - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml diff --git a/tests/vault/test_vault_asymmetric.yml b/tests/vault/test_vault_asymmetric.yml index a757e7fd9c1b328b8b41d44d075325babc30a621..2790cf5e019dfb7c2eecb66695c91f9a8fcbbae7 100644 --- a/tests/vault/test_vault_asymmetric.yml +++ b/tests/vault/test_vault_asymmetric.yml @@ -7,7 +7,7 @@ tasks: - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml - name: Ensure asymmetric vault is present ipavault: @@ -165,7 +165,7 @@ failed_when: result.changed or result.failed or (result.vault.data | default(false)) - name: Verify retrieved data. - slurp: + ansible.builtin.slurp: src: "{{ ansible_facts['env'].HOME }}/data.txt" register: slurpfile failed_when: slurpfile['content'] | b64decode != 'Hello World.' @@ -299,4 +299,4 @@ failed_when: result.changed or result.failed - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml diff --git a/tests/vault/test_vault_change_type.yml b/tests/vault/test_vault_change_type.yml index 8490a2c9a5f6582379c03ff7a0694e2d52e99e77..a5fb0c8bd0138133beb92ac39bbd40473d06554b 100644 --- a/tests/vault/test_vault_change_type.yml +++ b/tests/vault/test_vault_change_type.yml @@ -7,7 +7,7 @@ tasks: - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml - name: Ensure test_vault is absent. ipavault: @@ -42,7 +42,7 @@ failed_when: result.failed or not result.changed - name: Verify assymetric-only fields are not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -63,7 +63,7 @@ failed_when: result.failed or not result.changed - name: Verify salt is not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -94,7 +94,7 @@ failed_when: result.failed or not result.changed - name: Verify salt is not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -115,7 +115,7 @@ failed_when: result.failed or not result.changed - name: Verify assymetric-only fields are not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -168,7 +168,7 @@ failed_when: result.failed or not result.changed - name: Verify assymetric-only fields are not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -198,7 +198,7 @@ failed_when: result.failed or not result.changed - name: Verify salt is not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -246,7 +246,7 @@ failed_when: result.failed or not result.changed - name: Verify salt is not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -276,7 +276,7 @@ failed_when: result.failed or not result.changed or result.failed - name: Verify assymetric-only fields are not present. - shell: | + ansible.builtin.shell: | echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin KRB5CCNAME={{ krb5ccname }} ipa vault-show test_vault kdestroy -A -q -c {{ krb5ccname }} @@ -301,4 +301,4 @@ state: absent - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml diff --git a/tests/vault/test_vault_client_context.yml b/tests/vault/test_vault_client_context.yml index 2ebb410e9633aed52ac1dc22374daca7065b63dc..7f6fa452a5bb71e914bbd323a7ed06ac59aacc48 100644 --- a/tests/vault/test_vault_client_context.yml +++ b/tests/vault/test_vault_client_context.yml @@ -7,7 +7,7 @@ tasks: - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml # vault requires 'ipaapi_context: client', and uses this # context by defoult, so we test only for the case where @@ -22,4 +22,4 @@ failed_when: not (result.failed and result.msg is regex("Context 'server' for ipavault not yet supported.")) - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml diff --git a/tests/vault/test_vault_members.yml b/tests/vault/test_vault_members.yml index 219236aef176b86732f3a501b17172e0e5415da5..eb22e78eea79145c497f9a478afd7421737f86d5 100644 --- a/tests/vault/test_vault_members.yml +++ b/tests/vault/test_vault_members.yml @@ -7,7 +7,7 @@ tasks: - name: Test vault module member operations. - include_tasks: + ansible.builtin.include_tasks: file: tasks_vault_members.yml apply: tags: diff --git a/tests/vault/test_vault_standard.yml b/tests/vault/test_vault_standard.yml index 67aca2039feba07d8c6d819d36bae74918f1517d..c828d1bfb739526f254806aad23c3bdc70b2fee1 100644 --- a/tests/vault/test_vault_standard.yml +++ b/tests/vault/test_vault_standard.yml @@ -7,7 +7,7 @@ tasks: - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml - name: Ensure standard vault is present ipavault: @@ -67,7 +67,7 @@ failed_when: result.changed or result.failed or (result.vault.data | default(false)) - name: Verify retrieved data. - slurp: + ansible.builtin.slurp: src: "{{ ansible_facts['env'].HOME }}/data.txt" register: slurpfile failed_when: slurpfile['content'] | b64decode != 'Hello World.' @@ -138,4 +138,4 @@ failed_when: result.changed or result.failed - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml diff --git a/tests/vault/test_vault_symmetric.yml b/tests/vault/test_vault_symmetric.yml index 0ae79349703d57afb7fcd93f4152885c1f5b1432..89ee142482f067b9f0ee7023a113926b9e968002 100644 --- a/tests/vault/test_vault_symmetric.yml +++ b/tests/vault/test_vault_symmetric.yml @@ -7,7 +7,7 @@ tasks: - name: Setup testing environment. - import_tasks: env_setup.yml + ansible.builtin.import_tasks: env_setup.yml - name: Ensure symmetric vault is present ipavault: @@ -74,7 +74,7 @@ failed_when: result.changed or result.failed or (result.vault.data | default(false)) - name: Verify retrieved data. - slurp: + ansible.builtin.slurp: src: "{{ ansible_facts['env'].HOME }}/data.txt" register: slurpfile failed_when: slurpfile['content'] | b64decode != 'Hello World.' @@ -351,4 +351,4 @@ failed_when: result.failed or not result.changed - name: Cleanup testing environment. - import_tasks: env_cleanup.yml + ansible.builtin.import_tasks: env_cleanup.yml