From c93a5de460ab8d7fad17b9ac1a3f733956f18449 Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Thu, 13 Mar 2025 10:55:49 -0400
Subject: [PATCH] additional changes for managerhype

---
 pillar/hypervisor/nodes.sls  |  2 +-
 salt/libvirt/packages.sls    |  2 +-
 salt/libvirt/ssh/users.sls   |  4 +++-
 salt/salt/master.sls         | 13 -------------
 salt/salt/mine_functions.sls |  4 ++--
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pillar/hypervisor/nodes.sls b/pillar/hypervisor/nodes.sls
index 0cdec95d3..a25239d8d 100644
--- a/pillar/hypervisor/nodes.sls
+++ b/pillar/hypervisor/nodes.sls
@@ -1,7 +1,7 @@
 {% set node_types = {} %}
 {% for minionid, ip in salt.saltutil.runner(
     'mine.get',
-    tgt='G@role:so-hypervisor',
+    tgt='G@role:so-hypervisor or G@role:so-managerhype',
     fun='network.ip_addrs',
     tgt_type='compound') | dictsort()
 %}
diff --git a/salt/libvirt/packages.sls b/salt/libvirt/packages.sls
index 195232329..d2cbd6e2d 100644
--- a/salt/libvirt/packages.sls
+++ b/salt/libvirt/packages.sls
@@ -42,7 +42,7 @@ libvirt_python_module:
     - onchanges:
       - file: libvirt_python_wheel
 
-{%     if 'hyper' in grains.id.split('_') | last %}
+{%     if 'hype' in grains.id.split('_') | last %}
 
 # provides virsh
 install_libvirt-client:
diff --git a/salt/libvirt/ssh/users.sls b/salt/libvirt/ssh/users.sls
index 9b6a3beb7..375a42c38 100644
--- a/salt/libvirt/ssh/users.sls
+++ b/salt/libvirt/ssh/users.sls
@@ -21,7 +21,9 @@ qemu_ssh_client_config:
     - name: /root/.ssh/config
     - source: salt://libvirt/ssh/files/config
 
-{%     else %}
+{%     endif %}
+
+{%     if GLOBALS.role in ['so-hypervisor', 'so-managerhype'] %}
 
 # used for qemu+ssh connection between manager and hypervisors
 create_soqemussh_user:
diff --git a/salt/salt/master.sls b/salt/salt/master.sls
index 56f529e89..d6bd84496 100644
--- a/salt/salt/master.sls
+++ b/salt/salt/master.sls
@@ -86,19 +86,6 @@ salt_master_service:
       - file: engines_config
     - order: last
 
-{#
-# we need to managed adding the following to salt-master config if there are hypervisors
-reactor:
-  - 'salt/key':
-    - salt://reactor/check_hypervisor.sls
-  - 'salt/cloud/*/deploying':
-    - /opt/so/saltstack/default/salt/reactor/createEmptyPillar.sls
-  - 'setup/so-minion':
-    - /opt/so/saltstack/default/salt/reactor/sominion_setup.sls
-  - 'salt/cloud/*/destroyed':
-    - /opt/so/saltstack/default/salt/reactor/deleteKey.sls
-#}
-
 {% else %}
 
 {{sls}}_state_not_allowed:
diff --git a/salt/salt/mine_functions.sls b/salt/salt/mine_functions.sls
index a828add9b..3b81fd4a3 100644
--- a/salt/salt/mine_functions.sls
+++ b/salt/salt/mine_functions.sls
@@ -8,7 +8,7 @@
 # this state is included in the salt.minion state
 
 {% set role = salt['grains.get']('role', '') %}
-{% if role  == 'so-hypervisor' -%}
+{% if role in ['so-hypervisor','so-managerhype'] and salt['network.ip_addrs']('br0')|length > 0 -%}
 {%   set interface = 'br0' %}
 {% else %}
 {%   set interface = pillar.host.mainint %}
@@ -22,7 +22,7 @@ mine_functions:
         mine_functions:
           network.ip_addrs:
             - interface: {{ interface }}
-        {%- if role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] %}
+        {%- if role in ['so-eval','so-import','so-manager','so-managerhype','so-managersearch','so-standalone'] %}
           x509.get_pem_entries:
             - glob_path: '/etc/pki/ca.crt'
         {% endif -%}