ansible: use rust binary for facts instead of python and bash scripts

saltyorg · Jul 23, 2024 · 62cf2fa · 62cf2fa
1 parent aa6f402
commit 62cf2fa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 223 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 
 ### Ansible ###
 /backup.lock
+/ansible_facts.d/saltbox.fact
 
 # Vars
 /inventories/host_vars/*

diff --git a/ansible_facts.d/group.fact b/ansible_facts.d/group.fact
diff --git a/ansible_facts.d/network.fact b/ansible_facts.d/network.fact
diff --git a/ansible_facts.d/timezone.fact b/ansible_facts.d/timezone.fact
diff --git a/ansible_facts.d/user.fact b/ansible_facts.d/user.fact
diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
@@ -119,45 +119,34 @@ downloads_custom_path: "{{ false
 # User
 ################################
 
-uid: "{{ ansible_local.user[user.name].uid }}"
-
-gid: "{{ ansible_local.user[user.name].gid }}"
-
-vgid: "{{ ansible_local.group.video.gid }}"
-
-rgid: "{{ ansible_local.group.render.gid }}"
-
-dockergid: "{{ ansible_local.group.docker.gid }}"
+uid: "{{ ansible_local.saltbox.users[user.name].uid }}"
+gid: "{{ ansible_local.saltbox.users[user.name].gid }}"
+vgid: "{{ ansible_local.saltbox.groups.video.gid }}"
+rgid: "{{ ansible_local.saltbox.groups.render.gid }}"
+dockergid: "{{ ansible_local.saltbox.groups.docker.gid }}"
 
 ################################
 # Timezone
 ################################
 
 tz: "{{ system.timezone
      if system is defined and system.timezone is defined and 'auto' not in system.timezone | lower
-     else ansible_local.timezone.timezone
-          if ansible_local is defined and ansible_local.timezone is defined and ansible_local.timezone.timezone is defined and ansible_local.timezone.timezone | trim | length > 0
+     else ansible_local.saltbox.timezone.timezone
+          if ansible_local is defined and ansible_local.saltbox.timezone is defined and ansible_local.saltbox.timezone.timezone is defined and ansible_local.saltbox.timezone.timezone | trim | length > 0
           else 'Etc/UTC' }}"
 
 ################################
 # Network
 ################################
 
 ip_address_host: "0.0.0.0"
-
 ip_address_localhost: "127.0.0.1"
-
-ip_address_public: "{{ ansible_local.network.ip.public_ip }}"
-
-ip_address_public_is_valid: "{{ false if ansible_local.network.ip.failed_ipv4 else true }}"
-
-ip_address_public_error: "{{ ansible_local.network.ip.error_ipv4 }}"
-
-ipv6_address_public: "{{ ansible_local.network.ip.public_ipv6 }}"
-
-ipv6_address_public_is_valid: "{{ false if ansible_local.network.ip.failed_ipv6 else true }}"
-
-ipv6_address_public_error: "{{ ansible_local.network.ip.error_ipv6 }}"
+ip_address_public: "{{ ansible_local.saltbox.ip.public_ip }}"
+ip_address_public_is_valid: "{{ false if ansible_local.saltbox.ip.failed_ipv4 else true }}"
+ip_address_public_error: "{{ ansible_local.saltbox.ip.error_ipv4 }}"
+ipv6_address_public: "{{ ansible_local.saltbox.ip.public_ipv6 }}"
+ipv6_address_public_is_valid: "{{ false if ansible_local.saltbox.ip.failed_ipv6 else true }}"
+ipv6_address_public_error: "{{ ansible_local.saltbox.ip.error_ipv6 }}"
 
 ################################
 # Theme