From be5e41227f01ace25d22781a7f75e0d3381a3373 Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Fri, 23 May 2025 11:41:45 -0400
Subject: [PATCH] rename step

---
 salt/_runners/setup_hypervisor.py                    | 2 +-
 salt/soc/dyanno/hypervisor/map.jinja                 | 2 +-
 salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja | 4 ++--
 salt/vm/status/init.sls                              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/salt/_runners/setup_hypervisor.py b/salt/_runners/setup_hypervisor.py
index 47afc25d4..17bdacbd5 100644
--- a/salt/_runners/setup_hypervisor.py
+++ b/salt/_runners/setup_hypervisor.py
@@ -664,7 +664,7 @@ def setup_environment(vm_name: str = 'sool9', disk_size: str = '220G', minion_id
             # Run highstate on the hypervisor
             highstate_result = local.cmd(minion_id, 'state.highstate', [], timeout=1800)
             if highstate_result and minion_id in highstate_result:
-                log.info("MAIN: Highstate triggered on %s", minion_id)
+                log.info("MAIN: Highstate initiated on %s", minion_id)
             else:
                 log.error("MAIN: Highstate failed or timed out on %s", minion_id)
                 return {
diff --git a/salt/soc/dyanno/hypervisor/map.jinja b/salt/soc/dyanno/hypervisor/map.jinja
index 88b3f4425..4a5107371 100644
--- a/salt/soc/dyanno/hypervisor/map.jinja
+++ b/salt/soc/dyanno/hypervisor/map.jinja
@@ -9,6 +9,6 @@
     'Initialize Minion Pillars',
     'Created Instance',
     'Hardware Configuration',
-    'Highstate Triggered',
+    'Highstate Initiated',
     'Destroyed Instance'
 ] %}
diff --git a/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja b/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja
index 8ac7a7225..4222ff6b2 100644
--- a/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja
+++ b/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja
@@ -27,7 +27,7 @@
 {%- if baseDomainStatus == 'Initialized' %}
 {%-   if vm_list %}
 #### Virtual Machines
-Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Triggered", only "Destroyed Instance" updates the timestamp.
+Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Initiated", only "Destroyed Instance" updates the timestamp.
 
 | Name               | Status             | CPU Cores | Memory (GB)| Disk | Copper | SFP  | Last Updated        |
 |--------------------|--------------------|-----------|------------|------|--------|------|---------------------|
@@ -42,7 +42,7 @@ Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %},
 {%-     endfor %}
 {%-   else %}
 #### Virtual Machines
-Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Triggered", only "Destroyed Instance" updates the timestamp.
+Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Initiated", only "Destroyed Instance" updates the timestamp.
 
 No Virtual Machines Found
 {%-   endif %}
diff --git a/salt/vm/status/init.sls b/salt/vm/status/init.sls
index 570b36d19..64124aa85 100644
--- a/salt/vm/status/init.sls
+++ b/salt/vm/status/init.sls
@@ -15,9 +15,9 @@
 # so-salt-emit-vm-deployment-status sets event_tag = f'soc/dyanno/hypervisor/{status.lower()}'
 vm_highstate_trigger:
   event.send:
-    - name: soc/dyanno/hypervisor/highstate triggered
+    - name: soc/dyanno/hypervisor/highstate initiated
     - data:
-        status: Highstate Triggered
+        status: Highstate Initiated
         vm_name: {{ grains.id }}
         hypervisor: {{ salt['grains.get']('salt-cloud:profile', '').split('-')[1] }}
     - order: 1  # Ensure this runs early in the highstate process