Fixes #237: Use ansible_facts instead of raw ansible_ namespace.

Author: geerlingguy

roles/homebrew/README.md

@@ -14,8 +14,8 @@ Available variables are listed below, along with default values (see [`defaults/
 
 The GitHub repository for Homebrew core.
 
-    homebrew_prefix: "{{ (ansible_machine == 'arm64') | ternary('/opt/homebrew', '/usr/local') }}"
-    homebrew_install_path: "{{ homebrew_prefix }}{{ '/Homebrew' if ansible_machine != 'arm64' }}"
+    homebrew_prefix: "{{ (ansible_facts.machine == 'arm64') | ternary('/opt/homebrew', '/usr/local') }}"
+    homebrew_install_path: "{{ homebrew_prefix }}{{ '/Homebrew' if ansible_facts.machine != 'arm64' }}"
 
 The path where Homebrew will be installed (`homebrew_prefix` is the parent directory). It is recommended you stick to the default, otherwise Homebrew might have some weird issues. If you change this variable, you should also manually create a symlink back to `/opt/homebrew` (or `/usr/local` if you're on an Intel-mac) so things work as Homebrew expects.
 
@@ -80,11 +80,11 @@ The directory where your Brewfile is located.
 
 Set to `true` to remove the Hombrew cache after any new software is installed.
 
-    homebrew_user: "{{ ansible_user_id }}"
+    homebrew_user: "{{ ansible_facts.user_id }}"
 
 The user that you would like to install Homebrew as.
 
-    homebrew_group: "{{ ansible_user_gid }}"
+    homebrew_group: "{{ ansible_facts.user_gid }}"
 
 The group that you would like to use while installing Homebrew.
 

roles/homebrew/defaults/main.yml

@@ -1,8 +1,8 @@
 ---
 homebrew_repo: https://github.com/Homebrew/brew
 
-homebrew_prefix: "{{ (ansible_machine == 'arm64') | ternary('/opt/homebrew', '/usr/local') }}"
-homebrew_install_path: "{{ homebrew_prefix }}{{ '/Homebrew' if ansible_machine != 'arm64' }}"
+homebrew_prefix: "{{ (ansible_facts.machine == 'arm64') | ternary('/opt/homebrew', '/usr/local') }}"
+homebrew_install_path: "{{ homebrew_prefix }}{{ '/Homebrew' if ansible_facts.machine != 'arm64' }}"
 homebrew_brew_bin_path: "{{ homebrew_prefix }}/bin"
 
 homebrew_installed_packages: []

roles/homebrew/handlers/main.yml

@@ -6,5 +6,5 @@
     path: "{{ homebrew_cache_path.stdout | trim }}"
     state: absent
   when: 'homebrew_clear_cache | bool'
-  become: "{{ (homebrew_user != ansible_user_id) | bool }}"
+  become: "{{ (homebrew_user != ansible_facts.user_id) | bool }}"
   become_user: "{{ homebrew_user }}"

roles/homebrew/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: Determine Homebrew ownership variables
   set_fact:
-    homebrew_user: '{{ homebrew_user | default(ansible_user_id) }}'
-    homebrew_group: '{{ homebrew_group | default(ansible_user_gid) }}'
+    homebrew_user: '{{ homebrew_user | default(ansible_facts.user_id) }}'
+    homebrew_group: '{{ homebrew_group | default(ansible_facts.user_gid) }}'
 
 # Homebrew setup prerequisites.
 - name: Ensure Homebrew parent directory has correct permissions (Apple Silicon).
@@ -11,18 +11,18 @@
     owner: "{{ homebrew_user }}"
     state: directory
   become: true
-  when: ansible_machine == 'arm64'
+  when: ansible_facts.machine == 'arm64'
 
 - name: Ensure Homebrew parent directory has correct permissions (Intel).
-  when: ansible_machine == 'x86_64'
+  when: ansible_facts.machine == 'x86_64'
   block:
     - name: Ensure Homebrew parent directory has correct permissions (MacOS >= 10.13).
       file:
         path: "{{ homebrew_prefix }}"
         owner: root
         state: directory
       become: true
-      when: "ansible_distribution_version is version('10.13', '>=')"
+      when: "ansible_facts.distribution_version is version('10.13', '>=')"
 
     - name: Ensure Homebrew parent directory has correct permissions (MacOS < 10.13).
       file:
@@ -32,7 +32,7 @@
         state: directory
         mode: "0775"
       become: true
-      when: "ansible_distribution_version is version('10.13', '<')"
+      when: "ansible_facts.distribution_version is version('10.13', '<')"
 
 - name: Check if homebrew already exists.
   stat:
@@ -98,7 +98,7 @@
 - name: Add missing folder if not on Apple-chipset
   set_fact:
     homebrew_folders_base: "{{ homebrew_folders_base + ['Homebrew'] }}"
-  when: ansible_machine != 'arm64'
+  when: ansible_facts.machine != 'arm64'
 
 - name: Ensure proper homebrew folders are in place.
   file:
@@ -111,12 +111,12 @@
 
 - name: Collect package manager fact.
   setup:
-    filter: ansible_pkg_mgr
+    filter: ansible_facts.pkg_mgr
 
 - name: Perform brew installation.
   # Privilege escalation is only required for inner steps when
-  # the `homebrew_user` doesn't match the `ansible_user_id`
-  become: "{{ (homebrew_user != ansible_user_id) | bool }}"
+  # the `homebrew_user` doesn't match the `ansible_facts.user_id`
+  become: "{{ (homebrew_user != ansible_facts.user_id) | bool }}"
   become_user: "{{ homebrew_user }}"
   block:
     - name: Force update brew after installation.

roles/mas/README.md

@@ -38,7 +38,7 @@ A list of apps to ensure are installed on the computer using the Mac App Store.
 
 Whether to run `mas upgrade`, which will upgrade all installed Mac App Store apps.
 
-    mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_architecture == 'arm64' else '/usr/local/bin/mas' }}"
+    mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_facts.architecture == 'arm64' else '/usr/local/bin/mas' }}"
 
 When targeting a remote Mac, the PATH isn't always correct leading to the `mas` binary not being found. This variable allows you to override the path to the `mas` binary. The defaults above work for most installations, but you may need to override this if you have a custom Homebrew installation path or other custom setup.
 

roles/mas/defaults/main.yml

@@ -10,4 +10,4 @@ mas_installed_apps:
   - { id: 497799835, name: "Xcode (8.1)" }
 mas_upgrade_all_apps: false
 mas_signin_dialog: false
-mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_architecture == 'arm64' else '/usr/local/bin/mas' }}"
+mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_facts.architecture == 'arm64' else '/usr/local/bin/mas' }}"

roles/mas/tasks/main.yml

@@ -11,13 +11,13 @@
   check_mode: false
   changed_when: false
   when:
-    - ansible_distribution_version is version('12', '<')
+    - ansible_facts.distribution_version is version('12', '<')
 
 - name: Sign in to MAS when email and password are provided.
   command: '"{{ mas_path }}" signin "{{ mas_email }}" "{{ mas_password }}"'
   register: mas_signin_result
   when:
-    - ansible_distribution_version is version('10.13', '<')
+    - ansible_facts.distribution_version is version('10.13', '<')
     - mas_account_result.rc == 1
     - mas_email is truthy
     - mas_password is truthy
@@ -27,7 +27,7 @@
   command: '"{{ mas_path }}" signin "{{ mas_email }}" "{{ mas_password }}" --dialog'
   register: mas_signin_result
   when:
-    - ansible_distribution_version is version('10.13', '<')
+    - ansible_facts.distribution_version is version('10.13', '<')
     - mas_signin_dialog
     - mas_account_result.rc == 1
     - mas_email is truthy