feat(COLIMA): prefer brew_prefix, gather facts

osx-provisioner · Jul 9, 2023 · c60a515 · c60a515
1 parent e7b7fa9
commit c60a515
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/roles/colima/molecule/buildkit/verify.yml b/roles/colima/molecule/buildkit/verify.yml
@@ -1,7 +1,6 @@
 ---
 - name: Verify
   hosts: all
-  gather_facts: false
   tasks:
 
     - name: Display Logs For Troubleshooting Failures

diff --git a/roles/colima/molecule/common/tasks/verify_binaries.yml b/roles/colima/molecule/common/tasks/verify_binaries.yml
@@ -1,8 +1,4 @@
 ---
-- name: Set CI Machine Type
-  ansible.builtin.set_fact:
-    brew_prefix: "{{ (lookup('env', 'PLATFORM') == 'arm64') | ternary('/opt/homebrew', '/usr/local') }}"
-
 - name: Load Default Var Content
   ansible.builtin.include_vars: "../../../defaults/main.yml"
 

diff --git a/roles/colima/molecule/standard/verify.yml b/roles/colima/molecule/standard/verify.yml
@@ -1,7 +1,6 @@
 ---
 - name: Verify
   hosts: all
-  gather_facts: false
   tasks:
 
     - name: Display Logs For Troubleshooting Failures

diff --git a/roles/colima/tasks/service/launchd.yml b/roles/colima/tasks/service/launchd.yml
@@ -3,7 +3,7 @@
   become: true
   ansible.builtin.template:
     src: "service/colima-start-fg.sh.j2"
-    dest: "/usr/local/bin/colima-start-fg.sh"
+    dest: "{{ brew_prefix }}/bin/colima-start-fg.sh"
     mode: "0750"
     owner: "{{ colima_service_user }}"
     group: "staff"

diff --git a/roles/colima/templates/service/com.github.abiosoft.colima.plist.j2 b/roles/colima/templates/service/com.github.abiosoft.colima.plist.j2
@@ -9,7 +9,7 @@
     <key>ProgramArguments</key>
     <array>
       <string>/bin/bash</string>
-      <string>/usr/local/bin/colima-start-fg.sh</string>
+      <string>{{ brew_prefix }}/bin/colima-start-fg.sh</string>
     </array>
     <key>RunAtLoad</key>
     <true/>