support for fleet, heavynode, receiver, idh

salt/manager/tools/sbin/so-salt-cloud

@@ -11,7 +11,6 @@ import re
 import threading
 
 def call_so_firewall_minion(ip, role):
-    print("call_so_firewall_minion called")
     try:
         # Start so-firewall-minion as a subprocess
         process = subprocess.Popen(

salt/setup/virt/fleet.yaml

@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: FLEET
+CORECOUNT: 8
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 8
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 8
+MEMORY: 8
+DISKS: 0
+COPPER: 0
+SFP: 0

salt/setup/virt/heavynode.yaml

@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE: bond0
+NODETYPE: HEAVYNODE
+CORECOUNT: 8
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 8
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 8
+MEMORY: 16
+DISKS: 0
+COPPER: 0
+SFP: 0

salt/setup/virt/idh.yaml

@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: IDH
+CORECOUNT: 2
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 2
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 2
+MEMORY: 1
+DISKS: 0
+COPPER: 0
+SFP: 0

salt/setup/virt/receiver.yaml

@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: RECEIVER
+CORECOUNT: 2
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 2
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 2
+MEMORY: 8
+DISKS: 0
+COPPER: 0
+SFP: 0

salt/setup/virt/searchnode.yaml

@@ -1,18 +1,18 @@
 MAINIP:
 MNIC: eth0
-NODE_DESCRIPTION: 'virt search'
+NODE_DESCRIPTION: 'vm'
 ES_HEAP_SIZE:
 PATCHSCHEDULENAME:
-INTERFACE: bond0
+INTERFACE:
 NODETYPE: SEARCHNODE
-CORECOUNT: 16
+CORECOUNT: 8
 LSHOSTNAME:
 LSHEAP:
-CPUCORES: 16
+CPUCORES: 8
 IDH_MGTRESTRICT:
 IDH_SERVICES:
-CPU: 16
+CPU: 8
-MEMORY: 32
+MEMORY: 16
 DISKS: 1
 COPPER: 0
 SFP: 0

salt/setup/virt/sensor.yaml

@@ -1,6 +1,6 @@
 MAINIP:
 MNIC: eth0
-NODE_DESCRIPTION: 'virt sensor'
+NODE_DESCRIPTION: 'vm'
 ES_HEAP_SIZE:
 PATCHSCHEDULENAME:
 INTERFACE: bond0
@@ -12,7 +12,7 @@ CPUCORES: 4
 IDH_MGTRESTRICT:
 IDH_SERVICES:
 CPU: 8
-MEMORY: 8
+MEMORY: 12
 DISKS: 0
 COPPER: 0
 SFP: 0

salt/setup/virt/soinstall.map.jinja

@@ -11,11 +11,24 @@
 {% do DATA.update({'CORECOUNT': grains.num_cpus}) %}
 {% do DATA.update({'CPUCORES': grains.num_cpus}) %}
 
+{% if nodetype in ['searchnode', 'receiver', 'fleet', 'heavynode'] %}
 
-{% if nodetype == "searchnode" %}
+{#   we can't use the host grain here because the grain may not be updated yet from the hostname change #}
-
 {%   do DATA.update({'LSHOSTNAME': grains.id.split("_") | first}) %}
 
+{%   if total_mem >= 32000 or nodetype in ['managersearch','heavynode','standalone'] %}
+{%     set LSHEAP="1000m" %}
+{%   elif nodetype == 'eval' %}
+{%     set LSHEAP="700m" %}
+{%   else %}
+{%     set LSHEAP="500m" %}
+{%   endif %}
+{%   do DATA.update({'LSHEAP': LSHEAP}) %}
+
+{% endif %}
+
+{% if nodetype in ['searchnode', 'heavynode'] %}
+
 {#   this replicates the function es_heapsize in so-functions #}
 {%   if total_mem < 8000 %}
 {%     set ES_HEAP_SIZE = "600m" %}
@@ -31,13 +44,4 @@
 {%   endif %}
 {%   do DATA.update({'ES_HEAP_SIZE': ES_HEAP_SIZE}) %}
 
-{%   if total_mem >= 32000 or nodetype in ['managersearch','heavynode','standalone'] %}
-{%     set LSHEAP="1000m" %}
-{%   elif nodetype == 'eval' %}
-{%     set LSHEAP="700m" %}
-{%   else %}
-{%     set LSHEAP="500m" %}
-{%   endif %}
-{%   do DATA.update({'LSHEAP': LSHEAP}) %}
-
 {% endif %}