From e61d37893aa612d625ac1f0f5e562b0bd8c62a3c Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Mon, 24 Mar 2025 12:33:10 -0400
Subject: [PATCH] start salt-minion service when mainint has ip

---
 salt/salt/minion.defaults.yaml              | 1 -
 salt/salt/minion.sls                        | 3 ---
 salt/salt/service/salt-minion.service.jinja | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/salt/salt/minion.defaults.yaml b/salt/salt/minion.defaults.yaml
index 68ae04804..7ec839950 100644
--- a/salt/salt/minion.defaults.yaml
+++ b/salt/salt/minion.defaults.yaml
@@ -3,4 +3,3 @@ salt:
   minion:
     version: '3006.9'
     check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default
-    service_start_delay: 30 # in seconds.
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index ee7c1f14c..ae2f9f487 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -5,7 +5,6 @@
 {% from 'salt/map.jinja' import SALTPACKAGES %}
 {% from 'salt/map.jinja' import SYSTEMD_UNIT_FILE %}
 {% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %}
-{% set service_start_delay = SALTMINION.salt.minion.service_start_delay %}
 
 include:
   - salt.python_modules
@@ -89,8 +88,6 @@ salt_minion_service_unit_file:
     - name: {{ SYSTEMD_UNIT_FILE }}
     - source: salt://salt/service/salt-minion.service.jinja
     - template: jinja
-    - defaults:
-        service_start_delay: {{ service_start_delay }}
     - onchanges_in:
       - module: systemd_reload
 
diff --git a/salt/salt/service/salt-minion.service.jinja b/salt/salt/service/salt-minion.service.jinja
index 27c7a15b6..2763b30f5 100644
--- a/salt/salt/service/salt-minion.service.jinja
+++ b/salt/salt/service/salt-minion.service.jinja
@@ -8,8 +8,9 @@ KillMode=process
 Type=notify
 NotifyAccess=all
 LimitNOFILE=8192
+ExecStartPre=/bin/bash -c 'until /sbin/ip -4 addr show dev {{ salt["pillar.get"]("host:mainint") }} | grep -q "inet "; do sleep 1; done'
 ExecStart=/usr/bin/salt-minion
-ExecStartPre=/bin/sleep {{ salt['pillar.get']('salt:minion:service_start_delay', service_start_delay) }}
+TimeoutStartSec=120
 
 [Install]
 WantedBy=multi-user.target