vault: Use FQCN for ansible.builtin

Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is
ansible.builtin.set_fact instead of set_fact for example and aplies for
all actions that are part of ansible.builtin.

All the replaced ansible.builtins:
  assert, command, copy, debug, fail, fetch, file, import_playbook,
  import_tasks, include_role, include_tasks, include_vars, package,
  set_fact, shell, slurp, stat, systemd
This commit is contained in:
Thomas Woerner
2022-12-20 13:55:19 +01:00
parent 198298b2d0
commit b175c78c95
13 changed files with 35 additions and 35 deletions

View File

@@ -15,5 +15,5 @@
register: result
no_log: true
- name: Display retrieved data.
debug:
ansible.builtin.debug:
msg: "Data: {{ result.vault.data }}"

View File

@@ -15,5 +15,5 @@
register: result
no_log: true
- name: Display retrieved data.
debug:
ansible.builtin.debug:
msg: "Data: {{ result.vault.data }}"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -7,7 +7,7 @@
tasks:
- name: Test vault module member operations.
include_tasks:
ansible.builtin.include_tasks:
file: tasks_vault_members.yml
apply:
tags:

View File

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

View File

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