diff options
Diffstat (limited to 'roles')
-rw-r--r-- | roles/acmetool/base/tasks/selfsigned.yml | 9 | ||||
-rw-r--r-- | roles/usb-install/tasks/main.yml | 9 | ||||
-rw-r--r-- | roles/vm/install/tasks/main.yml | 11 |
3 files changed, 17 insertions, 12 deletions
diff --git a/roles/acmetool/base/tasks/selfsigned.yml b/roles/acmetool/base/tasks/selfsigned.yml index c533979c..f5fb0466 100644 --- a/roles/acmetool/base/tasks/selfsigned.yml +++ b/roles/acmetool/base/tasks/selfsigned.yml @@ -15,15 +15,18 @@ register: existing_selfsigned_interim_cert_stat - name: create selfsigned interim certificate - when: existing_selfsigned_interim_cert_id == "" or not existing_selfsigned_interim_cert_stat.stat.exists + when: not existing_selfsigned_interim_cert_id or not existing_selfsigned_interim_cert_stat.stat.exists block: - name: create temporary directory - command: mktemp -d /var/lib/acme/tmp/selfsigned-interim-cert-XXXXXXXXXX + tempfile: + path: /var/lib/acme/tmp + prefix: selfsigned-interim-cert- + state: directory register: tmpdir - name: set tmpdir variable set_fact: - tmpdir: "{{ tmpdir.stdout }}" + tmpdir: "{{ tmpdir.path }}" - name: generate private key for selfsigned interim certificate openssl_privatekey: diff --git a/roles/usb-install/tasks/main.yml b/roles/usb-install/tasks/main.yml index 1523aedc..fab32b02 100644 --- a/roles/usb-install/tasks/main.yml +++ b/roles/usb-install/tasks/main.yml @@ -1,22 +1,23 @@ --- - block: - name: Create temporary workdir - command: mktemp -d + tempfile: + state: directory register: tmpdir - import_role: name: preseed vars: - preseed_tmpdir: "{{ tmpdir.stdout }}" + preseed_tmpdir: "{{ tmpdir.path }}" - name: Copy the preseed initramfs to the artifacts directory copy: - src: "{{ tmpdir.stdout }}/initrd.preseed.gz" + src: "{{ tmpdir.path }}/initrd.preseed.gz" dest: "{{ artifacts_dir }}/" always: - name: Cleanup temporary workdir file: - path: "{{ tmpdir.stdout }}" + path: "{{ tmpdir.path }}" state: absent diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index 973f44d1..a971a7be 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -33,7 +33,8 @@ - block: - name: create a temporary workdir - command: mktemp -d + tempfile: + state: directory register: tmpdir - import_role: @@ -41,11 +42,11 @@ vars: ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" install_interface: enp1s1 - preseed_tmpdir: "{{ tmpdir.stdout }}" + preseed_tmpdir: "{{ tmpdir.path }}" - name: Make preseed workdir readable by qemu acl: - path: "{{ tmpdir.stdout }}" + path: "{{ tmpdir.path }}" state: present entity: libvirt-qemu etype: user @@ -58,7 +59,7 @@ xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" vars: run_installer: yes - preseed_tmpdir: "{{ tmpdir.stdout }}" + preseed_tmpdir: "{{ tmpdir.path }}" - name: start vm virt: @@ -90,7 +91,7 @@ always: - name: cleanup temporary workdir file: - path: "{{ tmpdir.stdout }}" + path: "{{ tmpdir.path }}" state: absent - name: define new production vm |