diff --git a/handlers/main.yml b/handlers/main.yml index 454ec3c..c35ea85 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,5 +3,4 @@ - name: "Update the trust store" ansible.builtin.command: update-ca-certificates changed_when: false - become: true listen: "update-ca-certificates" diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index a49f5c4..6a07ee9 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.import_vault_root_ca" ansible.builtin.include_role: diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 47a9f72..55097ef 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -1,23 +1,9 @@ --- - name: Verify hosts: all - gather_facts: false + gather_facts: true + become: true tasks: - - name: "Test: file /etc/hosts" - block: - - name: "Stat file /etc/hosts" - ansible.builtin.stat: - path: "/etc/hosts" - register: stat_etc_hosts - - - name: "Verify file /etc/hosts" - ansible.builtin.assert: - that: - - stat_etc_hosts.stat.exists - - stat_etc_hosts.stat.isreg - - stat_etc_hosts.stat.pw_name == 'root' - - stat_etc_hosts.stat.gr_name == 'root' - - name: "Test: directory /usr/local/share/ca-certificates" block: - name: "Stat directory /usr/local/share/ca-certificates" diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index a49f5c4..6a07ee9 100644 --- a/molecule/default_vagrant/converge.yml +++ b/molecule/default_vagrant/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.import_vault_root_ca" ansible.builtin.include_role: diff --git a/molecule/default_vagrant/verify.yml b/molecule/default_vagrant/verify.yml index cca82cb..55097ef 100644 --- a/molecule/default_vagrant/verify.yml +++ b/molecule/default_vagrant/verify.yml @@ -2,6 +2,7 @@ - name: Verify hosts: all gather_facts: true + become: true tasks: - name: "Test: directory /usr/local/share/ca-certificates" block: diff --git a/molecule/with_custom_ca/converge.yml b/molecule/with_custom_ca/converge.yml index a49f5c4..6a07ee9 100644 --- a/molecule/with_custom_ca/converge.yml +++ b/molecule/with_custom_ca/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.import_vault_root_ca" ansible.builtin.include_role: diff --git a/molecule/with_custom_ca/verify.yml b/molecule/with_custom_ca/verify.yml index 977fce5..f25fa2f 100644 --- a/molecule/with_custom_ca/verify.yml +++ b/molecule/with_custom_ca/verify.yml @@ -1,23 +1,9 @@ --- - name: Verify hosts: all - gather_facts: false + gather_facts: true + become: true tasks: - - name: "Test: file /etc/hosts" - block: - - name: "Stat file /etc/hosts" - ansible.builtin.stat: - path: "/etc/hosts" - register: stat_etc_hosts - - - name: "Verify file /etc/hosts" - ansible.builtin.assert: - that: - - stat_etc_hosts.stat.exists - - stat_etc_hosts.stat.isreg - - stat_etc_hosts.stat.pw_name == 'root' - - stat_etc_hosts.stat.gr_name == 'root' - - name: "Test: directory /usr/local/share/ca-certificates" block: - name: "Stat directory /usr/local/share/ca-certificates" diff --git a/molecule/with_custom_ca_vagrant/converge.yml b/molecule/with_custom_ca_vagrant/converge.yml index a49f5c4..6a07ee9 100644 --- a/molecule/with_custom_ca_vagrant/converge.yml +++ b/molecule/with_custom_ca_vagrant/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.import_vault_root_ca" ansible.builtin.include_role: diff --git a/molecule/with_custom_ca_vagrant/verify.yml b/molecule/with_custom_ca_vagrant/verify.yml index e4c276f..f25fa2f 100644 --- a/molecule/with_custom_ca_vagrant/verify.yml +++ b/molecule/with_custom_ca_vagrant/verify.yml @@ -2,6 +2,7 @@ - name: Verify hosts: all gather_facts: true + become: true tasks: - name: "Test: directory /usr/local/share/ca-certificates" block: diff --git a/tasks/import.yml b/tasks/import.yml index 22dcdca..19596dd 100644 --- a/tasks/import.yml +++ b/tasks/import.yml @@ -23,6 +23,5 @@ cmd: openssl x509 -inform {{ 'PEM' if item.rc == 0 else 'DER' }} -in {{ item.item.dest }} -out {{ import_vault_root_ca_cert_dir }}/{{ item.item.item.cert_name }}.crt -outform pem creates: "{{ import_vault_root_ca_cert_dir }}/{{ item.item.item.cert_name }}.crt" loop: "{{ cert_format_results.results }}" - become: true notify: - update-ca-certificates