updates

salt/setup/virt/setHostname.sls

@@ -3,7 +3,7 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% from 'soinstall.map.jinja' import DATA %}
+{% from 'setup/virt/soinstall.map.jinja' import DATA %}
 
 setHostname_{{grains.id.split("_") | first}}:
   network.system:
@@ -16,6 +16,7 @@ create_pillar:
   event.send:
     - name: setup/so-minion
     - data:
+        HYPERVISOR_HOST: {{ grains.hypervisor_host }}
         MAINIP: {{ DATA.MAINIP }}
         MNIC: {{ DATA.MNIC }}
         NODE_DESCRIPTION: '{{ DATA.NODE_DESCRIPTION }}'
@@ -35,6 +36,10 @@ create_pillar:
         COPPER: {{ DATA.COPPER }}
         SFP: {{ DATA.SFP }}
 
+set_role_grain:
+  grains.present:
+    - name: role
+    - value: so-{{ grains.id.split("_") | last }}
 
 # set event for firewall rules - so-firewall-minion
 
@@ -47,7 +52,7 @@ clean_sls_list:
 clean_setHostname:
   file.line:
     - name: /etc/salt/minion
-    - match: '- setHostname'
+    - match: '- setup.virt.setHostname'
     - mode: delete
     - onchanges:
       - file: clean_sls_list

salt/setup/virt/soinstall.map.jinja

@@ -1,10 +1,10 @@
 {# 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 
+   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 nodetype = grains.id.split("_") | last %}
-{% import_yaml nodetype ~ '.yaml' as DATA %}
+{% import_yaml 'setup/virt/' ~ nodetype ~ '.yaml' as DATA %}
 {% set total_mem  = grains.mem_total %}
 
 {% do DATA.update({'MAINIP': grains.ip_interfaces.get(DATA.MNIC)[0]}) %}
@@ -12,7 +12,7 @@
 {% do DATA.update({'CPUCORES': grains.num_cpus}) %}
 
 
-{% if nodetype = "searchnode" %}
+{% if nodetype == "searchnode" %}
 
 {%   do DATA.update({'LSHOSTNAME': grains.host}) %}