X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fpreseed%2Ftasks%2Fmain.yml;h=7406154c75c0869f8b027f605923a8aa5d8f1ba3;hb=d15a9e06d1a1a1e893160906a5822309ec9e3380;hp=d458d491556423a4993e161825c5a40046f2dd24;hpb=7585a5d69df0d1cd5e3d7d9382c115d6a93b2ef9;p=noc.git

diff --git a/ansible/roles/preseed/tasks/main.yml b/ansible/roles/preseed/tasks/main.yml
index d458d49..7406154 100644
--- a/ansible/roles/preseed/tasks/main.yml
+++ b/ansible/roles/preseed/tasks/main.yml
@@ -1,40 +1,25 @@
-- block:
-    - name: Make a temporary directory
-      command: mktemp -d
-      register: tmpdir
+- name: Copy initramfs into position
+  copy:
+    remote_src: yes
+    src: "{{ debian_installer_path | mandatory }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/initrd.gz"
+    dest: "{{ preseed_tmpdir }}/initrd.preseed.gz"
 
-    - set_fact:
-        tmpdir: "{{ tmpdir.stdout }}"
-        initramfs: "{{ preseed_path | mandatory }}/{{ hostname }}-{{ distro }}-{{ distcodename }}.initrd.gz"
+- name: Generate preseed file
+  template:
+    src: "preseed_{{ install_distro }}-{{ install_codename }}.cfg.j2"
+    dest: "{{ preseed_tmpdir }}/preseed.cfg"
 
-    - name: Copy initramfs into position
-      copy:
-        remote_src: yes
-        src: "{{ debian_installer_path | mandatory }}/{{ distro }}-{{ distcodename }}/{{ install.arch | default('amd64') }}/initrd.gz"
-        dest: "{{ initramfs }}"
+- name: Generate authorized_keys file
+  authorized_key:
+    user: root
+    manage_dir: no
+    path: "{{ preseed_tmpdir }}/authorized_keys"
+    key: "{{ ssh_keys_root | join('\n') }}"
 
-    - name: Generate preseed file
-      template:
-        src: "preseed_{{ distro }}-{{ distcodename }}.cfg.j2"
-        dest: "{{ tmpdir }}/preseed.cfg"
-
-    - name: Generate authorized_keys file
-      authorized_key:
-        user: root
-        manage_dir: no
-        path: "{{ tmpdir }}/authorized_keys"
-        key: "{{ ssh_keys | join('\n') }}"
-
-    - name: Inject files into initramfs
-      shell: cpio -H newc -o | gzip -9 >> '{{ initramfs }}'
-      args:
-        chdir: "{{ tmpdir }}"
-        stdin: |
-          preseed.cfg
-          authorized_keys
-
-  always:
-    - name: Delete temporary directory
-      file:
-        path: "{{ tmpdir }}"
-        state: absent
+- name: Inject files into initramfs
+  shell: cpio -H newc -o | gzip -9 >> 'initrd.preseed.gz'
+  args:
+    chdir: "{{ preseed_tmpdir }}"
+    stdin: |
+      preseed.cfg
+      authorized_keys