salt3006.9, redo reactors, use virt.shutdown

salt/setup/virt/sensor.yaml

@@ -11,9 +11,8 @@ LSHEAP:
 CPUCORES: 4
 IDH_MGTRESTRICT:
 IDH_SERVICES:
-CPU: 16
-MEMORY: 16
-DISKS: 1
-COPPER:
-  - 1
-SFP: 2
+CPU: 8
+MEMORY: 8
+DISKS: 0
+COPPER: 0
+SFP: 0

salt/setup/virt/setHostname.sls

@@ -1,10 +1,8 @@
 # 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.
 
-{% from 'setup/virt/soinstall.map.jinja' import DATA %}
-
 setHostname_{{grains.id.split("_") | first}}:
   cmd.run:
     - name: hostnamectl set-hostname --static {{grains.id.split("_") | first}}
@@ -13,56 +11,3 @@ setHostname_{{grains.id.split("_") | first}}:
     - enabled: True
     - hostname: {{grains.id.split("_") | first}}
     - apply_hostname: True
-
-set_role_grain:
-  grains.present:
-    - name: role
-    - value: so-{{ grains.id.split("_") | last }}
-
-# set event for firewall rules - so-firewall-minion
-
-clean_sls_list:
-  file.line:
-    - name: /etc/salt/minion
-    - match: 'sls_list:'
-    - mode: delete
-
-clean_setHostname:
-  file.line:
-    - name: /etc/salt/minion
-    - match: '- setup.virt.setHostname'
-    - mode: delete
-    - onchanges:
-      - file: clean_sls_list
-
-set_highstate:
-  file.replace:
-    - name: /etc/salt/minion
-    - pattern: 'startup_states: sls'
-    - repl: 'startup_states: highstate'
-    - onchanges:
-      - file: clean_setHostname
-
-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 }}'
-        ES_HEAP_SIZE: {{ DATA.ES_HEAP_SIZE }}
-        PATCHSCHEDULENAME: {{ DATA.PATCHSCHEDULENAME }}
-        INTERFACE: {{ DATA.INTERFACE }}
-        NODETYPE: {{ DATA.NODETYPE }}
-        CORECOUNT: {{ DATA.CORECOUNT }}
-        LSHOSTNAME: {{ DATA.LSHOSTNAME }}
-        LSHEAP: {{ DATA.LSHEAP }}
-        CPUCORES: {{ DATA.CPUCORES }}
-        IDH_MGTRESTRICT: {{ DATA.IDH_MGTRESTRICT }}
-        IDH_SERVICES: {{ DATA.IDH_SERVICES }}
-        CPU: {{ DATA.CPU }}
-        MEMORY: {{ DATA.MEMORY }}
-        DISKS: {{ DATA.DISKS }}
-        COPPER: {{ DATA.COPPER }}
-        SFP: {{ DATA.SFP }}

salt/setup/virt/setSalt.sls

@@ -0,0 +1,16 @@
+# 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_role_grain:
+  grains.present:
+    - name: role
+    - value: so-{{ grains.id.split("_") | last }}
+
+# set event for firewall rules - so-firewall-minion
+
+set_highstate:
+  file.append:
+    - name: /etc/salt/minion
+    - text: 'startup_states: highstate'

salt/setup/virt/sominion.sls

@@ -0,0 +1,30 @@
+# 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.
+
+{% from 'setup/virt/soinstall.map.jinja' import DATA %}
+
+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 }}'
+        ES_HEAP_SIZE: {{ DATA.ES_HEAP_SIZE }}
+        PATCHSCHEDULENAME: {{ DATA.PATCHSCHEDULENAME }}
+        INTERFACE: {{ DATA.INTERFACE }}
+        NODETYPE: {{ DATA.NODETYPE }}
+        CORECOUNT: {{ DATA.CORECOUNT }}
+        LSHOSTNAME: {{ DATA.LSHOSTNAME }}
+        LSHEAP: {{ DATA.LSHEAP }}
+        CPUCORES: {{ DATA.CPUCORES }}
+        IDH_MGTRESTRICT: {{ DATA.IDH_MGTRESTRICT }}
+        IDH_SERVICES: {{ DATA.IDH_SERVICES }}
+        CPU: {{ DATA.CPU }}
+        MEMORY: {{ DATA.MEMORY }}
+        DISKS: {{ DATA.DISKS }}
+        COPPER: {{ DATA.COPPER }}
+        SFP: {{ DATA.SFP }}