Merge pull request #14803 from Security-Onion-Solutions/vlb2

ensure hypervisor is remove from salt cloud profiles when key is deleted

salt/orch/delete_hypervisor.sls

@@ -0,0 +1,22 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% set hypervisor = pillar.minion_id %}
+
+ensure_hypervisor_mine_deleted:
+  salt.function:
+    - name: file.remove
+    - tgt: 'G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval'
+    - tgt_type: compound
+    - arg:
+      - /var/cache/salt/master/minions/{{hypervisor}}
+
+update_salt_cloud_profile:
+  salt.state:
+    - tgt: 'G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval'
+    - tgt_type: compound
+    - sls:
+      - salt.cloud.config
+    - concurrent: True

salt/reactor/check_hypervisor.sls

@@ -1,5 +1,24 @@
-{% if data['act'] == 'accept' and data['id'].endswith(('_hypervisor', '_managerhyper')) and data['result'] == True %}
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% if data['id'].endswith('_hypervisor') and data['result'] == True %}
+
+{%   if data['act'] == 'accept' %}
 check_and_trigger:
   runner.setup_hypervisor.setup_environment:
     - minion_id: {{ data['id'] }}
+{%   endif %}
+
+{%   if data['act'] == 'delete' %}
+delete_hypervisor:
+  runner.state.orchestrate:
+    - args:
+      - mods: orch.delete_hypervisor
+      - pillar:
+          minion_id: {{ data['id'] }}
+{%   endif %}
+
 {% endif %}
+