adding hauler store

MozeBaltyk · May 14, 2024 · 19c2404 · 19c2404
1 parent 9701d5a
commit 19c2404
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/roles/install_rke2_controller/tasks/admin.yml b/roles/install_rke2_controller/tasks/admin.yml
@@ -53,29 +53,30 @@
     # Install helm / k9s
     - name: Ensure .local/bin dir exist
       ansible.builtin.file:
-        path: "$HOME/.local/bin"
+        path: "$HOME/.local/bin/{{ item }}"
         state: directory
         mode: 0700
         recurse: true
+      loop:
+        - "helm"
+        - "k9s"
 
     - name: Download helm bin to .local/bin
       ansible.builtin.unarchive:
         src: "http://{{ hauler_server }}:8080/helm.tar.gz"
-        dest: "$HOME/.local/bin"
+        dest: "$HOME/.local/bin/helm"
         owner: "{{ admin_user }}"
         group: "{{ admin_user }}"
         mode: '0750'
         remote_src: true
         validate_certs: false
-        extra_opts: ['--strip-components=1']
 
     - name: Download k9s bin to .local/bin
       ansible.builtin.unarchive:
         src: "http://{{ hauler_server }}:8080/k9s.tar.gz"
-        dest: "$HOME/.local/bin"
+        dest: "$HOME/.local/bin/k9s"
         owner: "{{ admin_user }}"
         group: "{{ admin_user }}"
         mode: '0750'
         remote_src: true
         validate_certs: false
-        extra_opts: ['--strip-components=1']
diff --git a/roles/install_utils_nerdctl/tasks/install.yml b/roles/install_utils_nerdctl/tasks/install.yml
@@ -14,16 +14,20 @@
         path: /usr/local/bin/nerdctl
       register: file_data
 
+    - name: Create tmp dir
+      ansible.builtin.file:
+        path: /tmp/nerdctl
+        state: directory
+        mode: '0750'
+      when: not file_data.stat.exists
+
     - name: Download Nerdctl bin into /usr/local/bin
       ansible.builtin.unarchive:
         src: "http://{{ hauler_server }}:8080/nerdctl.tar.gz"
-        dest: "/usr/local/bin"
-        owner: "{{ admin_user }}"
-        group: "{{ admin_user }}"
+        dest: "/tmp/nerdctl"
         mode: '0750'
         remote_src: true
         validate_certs: false
-        extra_opts: ['--strip-components=1']
       when: not file_data.stat.exists
 
 #- name: Download Nerdctl archive
@@ -35,7 +39,7 @@
 #- name: Unarchive Nerdctl
 #  ansible.builtin.unarchive:
 #    src: "/usr/local/bin/nerdctl-archive.tar.gz"
-#    dest: "/usr/local/bin/"
+#    dest: "/usr/local/bin/."
 #    owner: "{{ admin_user }}"
 #    group: "{{ admin_user }}"
 #    mode: '0750'