From 3c85b482912dbcc208bbac6f1be45afc3b013d9c Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 29 Jan 2025 08:12:50 -0500
Subject: [PATCH] manage with contents to simplify salt cloud profile file_map

---
 .../cloud/cloud.profiles.d/socloud.conf.jinja | 10 ++++++++--
 .../etc/minion.d/mine_functions.conf.jinja    | 14 --------------
 salt/salt/mine_functions.sls                  | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 salt/salt/etc/minion.d/mine_functions.conf.jinja

diff --git a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
index eb2f5b75e..35b9d8bba 100644
--- a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
+++ b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
@@ -35,9 +35,15 @@ sool9-{{host}}:
   #  - echo "preflight_cmds"
   # the destination directory will be created if it doesn't exist
   file_map:
-    /opt/so/saltstack/default/salt/setup/virt/initial_schedule.sls: /opt/so/conf/salt/cloud_file_map/salt/initial_schedule.sls
+    /opt/so/saltstack/default/salt/setup/virt/initial_schedule.sls: /opt/so/conf/salt/cloud_file_map/salt/setup/virt/initial_schedule.sls
+    /opt/so/saltstack/default/salt/salt/mine_functions.sls: /opt/so/conf/salt/cloud_file_map/salt/salt/mine_functions.sls
   inline_script:
-    - "sudo salt-call state.apply initial_schedule --local --file-root=/opt/so/conf/salt/cloud_file_map/salt/"
+    - |
+      sudo salt-call state.apply salt.mine_functions \
+        --local \
+        --file-root=/opt/so/conf/salt/cloud_file_map/salt/ \
+        pillar='{"host": {"mainint": "eth0"}}'
+    - "sudo salt-call state.apply setup.virt.initial_schedule --local --file-root=/opt/so/conf/salt/cloud_file_map/salt/"
   #  - "rpm --import /tmp/securityonion.pub"
   # grains to add to the minion
 
diff --git a/salt/salt/etc/minion.d/mine_functions.conf.jinja b/salt/salt/etc/minion.d/mine_functions.conf.jinja
deleted file mode 100644
index fb721512f..000000000
--- a/salt/salt/etc/minion.d/mine_functions.conf.jinja
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if grains.role == 'so-hypervisor' %}
-{%   set interface = 'br0' %}
-{% else %}
-{%   set interface = pillar.host.mainint %}
-{% endif %}
-
-mine_interval: 25
-mine_functions:
-  network.ip_addrs:
-    - interface: {{ interface }}
-{%- if grains.role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] %}
-  x509.get_pem_entries:
-    - glob_path: '/etc/pki/ca.crt'
-{% endif -%}
diff --git a/salt/salt/mine_functions.sls b/salt/salt/mine_functions.sls
index 49a47e524..a828add9b 100644
--- a/salt/salt/mine_functions.sls
+++ b/salt/salt/mine_functions.sls
@@ -6,8 +6,23 @@
 # this state was seperated from salt.minion state since it is called during setup
 # GLOBALS are imported in the salt.minion state and that is not available at that point in setup
 # this state is included in the salt.minion state
+
+{% set role = salt['grains.get']('role', '') %}
+{% if role  == 'so-hypervisor' -%}
+{%   set interface = 'br0' %}
+{% else %}
+{%   set interface = pillar.host.mainint %}
+{% endif %}
+
 mine_functions:
   file.managed:
     - name: /etc/salt/minion.d/mine_functions.conf
-    - source: salt://salt/etc/minion.d/mine_functions.conf.jinja
-    - template: jinja
+    - contents: |
+        mine_interval: 25
+        mine_functions:
+          network.ip_addrs:
+            - interface: {{ interface }}
+        {%- if role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] %}
+          x509.get_pem_entries:
+            - glob_path: '/etc/pki/ca.crt'
+        {% endif -%}