CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

var and comment update

Browse Source
This commit is contained in:
Josh Patterson
2025-10-08 11:51:35 -04:00
parent 659c039ba8
commit e45b0bf871
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
salt/manager/tools/sbin_jinja/so-salt-cloud
View File

@@ -712,7 +712,7 @@ def main():
# Priority: disk passthrough > volume creation (but volume can coexist with copper/sfp NICs) # Priority: disk passthrough > volume creation (but volume can coexist with copper/sfp NICs)
# Note: virtual_node_manager.py already filters out --nsm-size when disk is present, # Note: virtual_node_manager.py already filters out --nsm-size when disk is present,
# so if both --pci and --nsm-size are present here, the PCI devices are copper/sfp NICs # so if both --pci and --nsm-size are present here, the PCI devices are copper/sfp NICs
use_disk_passthrough = False use_passthrough = False
use_volume_creation = False use_volume_creation = False
has_nic_passthrough = False has_nic_passthrough = False
@@ -730,9 +730,11 @@ def main():
has_nic_passthrough = True has_nic_passthrough = True
logger.info(f"PCI devices (copper/sfp NICs) will be passed through along with volume: {', '.join(args.pci)}") logger.info(f"PCI devices (copper/sfp NICs) will be passed through along with volume: {', '.join(args.pci)}")
elif args.pci: elif args.pci:
# Only PCI devices, no nsm_size - this is disk passthrough # Only PCI devices, no nsm_size - could be disk or NICs
use_disk_passthrough = True # this script is called by virtual_node_manager and that strips any possibility that nsm_size and the disk pci slot is sent to this script
logger.info(f"Using disk passthrough (--pci parameter specified without --nsm-size)") # we might have not specified a disk passthrough or nsm_size, but pass another pci slot and we end up here
use_passthrough = True
logger.info(f"Configuring PCI device passthrough.(--pci parameter specified without --nsm-size)")
# Step 4: Configure hardware based on storage approach # Step 4: Configure hardware based on storage approach
if use_volume_creation: if use_volume_creation:
@@ -747,8 +749,8 @@ def main():
# No NICs, just start the VM # No NICs, just start the VM
logger.info(f"Starting VM {args.vm_name}") logger.info(f"Starting VM {args.vm_name}")
run_qcow2_modify_hardware_config(args.profile, args.vm_name, cpu=None, memory=None, pci_list=None, start=True) run_qcow2_modify_hardware_config(args.profile, args.vm_name, cpu=None, memory=None, pci_list=None, start=True)
elif use_disk_passthrough: elif use_passthrough:
# Use existing disk passthrough logic via modify_hardware_config # Use existing passthrough logic via modify_hardware_config
run_qcow2_modify_hardware_config(args.profile, args.vm_name, cpu=args.cpu, memory=args.memory, pci_list=args.pci, start=True) run_qcow2_modify_hardware_config(args.profile, args.vm_name, cpu=args.cpu, memory=args.memory, pci_list=args.pci, start=True)
else: else:
# No storage configuration, just configure CPU/memory if specified # No storage configuration, just configure CPU/memory if specified