add distro information to automated server list (#282)

python · Sep 19, 2022 · 6171038 · 6171038
1 parent 3cc68cb
commit 6171038
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/pillar/dev/networking.sls b/pillar/dev/networking.sls
@@ -15,3 +15,7 @@ mine_functions:
 
   ipv6_addrs:
     mine_function: network.ip_addrs6
+
+  osfinger:
+    - mine_function: grains.get
+    - osfinger
diff --git a/pillar/prod/networking.sls b/pillar/prod/networking.sls
@@ -19,3 +19,7 @@ mine_functions:
   public_ipv4:
     mine_function: network.ip_addrs
     type: 'public'
+
+  osfinger:
+    - mine_function: grains.get
+    - osfinger
diff --git a/salt/base/config/salt-server-list.rst.jinja b/salt/base/config/salt-server-list.rst.jinja
@@ -7,13 +7,14 @@
 {% endfor %}
 
 .. csv-table::
-   :header: "Name", "Purpose", "Contact", "Datacener"
+   :header: "Name", "Purpose", "Contact", "Distro", "Datacener"
 
 {% for server in salt['minion.list']()['minions']|sort -%}
 {% set role = salt['match.filter_by'](role_mapping, minion_id=server) -%}
 {% set datacenter = salt['mine.get']("*", "psf_dc").get(server, "") -%}
+{% set distro = salt['mine.get']("*", "osfinger").get(server, "") -%}
 {% set roleconfig = salt["pillar.get"]("roles", {}).get(role, {}) %}
-   "{{ server }}", "{{ roleconfig.get("purpose", "") }}", "{{ roleconfig.get("contact", "") }}", "{{ datacenter }}"
+   "{{ server }}", "{{ roleconfig.get("purpose", "") }}", "{{ roleconfig.get("contact", "") }}", "{{ distro }}", "{{ datacenter }}"
 {%- endfor %}
 
 ..