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

only update mine if hypervisor provided

Browse Source
This commit is contained in:
Josh Patterson
2025-04-24 12:59:43 -04:00
parent 4df3070a1d
commit b2bd8577b9
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
salt/_runners/setup_hypervisor.py
View File

@@ -516,29 +516,30 @@ def setup_environment(vm_name: str = 'sool9', disk_size: str = '220G', minion_id
'vm_result': None 'vm_result': None
} }
# Initialize the LocalClient if minion_id:
local = salt.client.LocalClient() # Initialize the LocalClient
local = salt.client.LocalClient()
# Add retry logic for mine.update # Add retry logic for mine.update
max_retries = 10 max_retries = 10
retry_delay = 3 retry_delay = 3
mine_update_success = False mine_update_success = False
for attempt in range(1, max_retries + 1): for attempt in range(1, max_retries + 1):
mine_update_result = local.cmd(minion_id, 'mine.update') mine_update_result = local.cmd(minion_id, 'mine.update')
log.debug(f"DYANNO: mine_update_result: {mine_update_result}") log.debug(f"DYANNO: mine_update_result: {mine_update_result}")
# Check if mine.update was successful # Check if mine.update was successful
if mine_update_result and all(mine_update_result.values()): if mine_update_result and all(mine_update_result.values()):
log.info(f"DYANNO: mine.update successful on attempt {attempt}") log.info(f"DYANNO: mine.update successful on attempt {attempt}")
mine_update_success = True mine_update_success = True
break break
else: else:
log.warning(f"DYANNO: mine.update failed on attempt {attempt}/{max_retries}, retrying in {retry_delay} seconds...") log.warning(f"DYANNO: mine.update failed on attempt {attempt}/{max_retries}, retrying in {retry_delay} seconds...")
time.sleep(retry_delay) time.sleep(retry_delay)
if not mine_update_success: if not mine_update_success:
log.error(f"DYANNO: mine.update failed after {max_retries} attempts") log.error(f"DYANNO: mine.update failed after {max_retries} attempts")
# Apply the soc.dyanno.hypervisor state on the salt master # Apply the soc.dyanno.hypervisor state on the salt master
if not _apply_dyanno_hypervisor_state(): if not _apply_dyanno_hypervisor_state():