From 90137f70934207db80cf7cd6d49a89b4258d0d29 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 11 Mar 2026 11:55:01 -0400 Subject: [PATCH 1/2] remove 10T limit for virtual disk --- salt/salt/engines/master/virtual_node_manager.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/salt/salt/engines/master/virtual_node_manager.py b/salt/salt/engines/master/virtual_node_manager.py index ccc063d64..dc3bb9720 100644 --- a/salt/salt/engines/master/virtual_node_manager.py +++ b/salt/salt/engines/master/virtual_node_manager.py @@ -805,11 +805,6 @@ def process_vm_creation(hypervisor_path: str, vm_config: dict) -> None: mark_invalid_hardware(hypervisor_path, vm_name, vm_config, {'nsm_size': 'Invalid nsm_size: must be positive integer'}) return - if size > 10000: # 10TB reasonable maximum - log.error("VM: %s - nsm_size %dGB exceeds reasonable maximum (10000GB)", vm_name, size) - mark_invalid_hardware(hypervisor_path, vm_name, vm_config, - {'nsm_size': f'Invalid nsm_size: {size}GB exceeds maximum (10000GB)'}) - return log.debug("VM: %s - nsm_size validated: %dGB", vm_name, size) except (ValueError, TypeError) as e: log.error("VM: %s - nsm_size must be a valid integer, got: %s", vm_name, vm_config.get('nsm_size')) From 89b18341c55d8fdb564cadd9028a39db8dd0a358 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 11 Mar 2026 11:55:42 -0400 Subject: [PATCH 2/2] add URL_BASE to vm hosts file --- salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja | 6 +++++- salt/salt/cloud/config.sls | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja index 23fd15983..f8e5d5555 100644 --- a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja +++ b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja @@ -29,7 +29,11 @@ sool9_{{host}}: hypervisor_host: {{host ~ "_" ~ role}} preflight_cmds: - | - tee -a /etc/hosts <<< "{{ MANAGERIP }} {{ MANAGERHOSTNAME }}" + {%- set hostnames = [MANAGERHOSTNAME] %} + {%- if not (URL_BASE | ipaddr) and URL_BASE != MANAGERHOSTNAME %} + {%- do hostnames.append(URL_BASE) %} + {%- endif %} + tee -a /etc/hosts <<< "{{ MANAGERIP }} {{ hostnames | join(' ') }}" - | timeout 600 bash -c 'trap "echo \"Preflight Check: Failed to establish repo connectivity\"; exit 1" TERM; \ while ! dnf makecache --repoid=securityonion >/dev/null 2>&1; do echo "Preflight Check: Waiting for repo connectivity..."; \ diff --git a/salt/salt/cloud/config.sls b/salt/salt/cloud/config.sls index dce0e873a..cefd6ec78 100644 --- a/salt/salt/cloud/config.sls +++ b/salt/salt/cloud/config.sls @@ -14,6 +14,7 @@ {% if 'vrt' in salt['pillar.get']('features', []) %} {% set HYPERVISORS = salt['pillar.get']('hypervisor:nodes', {} ) %} {% from 'salt/map.jinja' import SALTVERSION %} +{% from 'vars/globals.map.jinja' import GLOBALS %} {% if HYPERVISORS %} cloud_providers: @@ -34,6 +35,7 @@ cloud_profiles: MANAGERHOSTNAME: {{ grains.host }} MANAGERIP: {{ pillar.host.mainip }} SALTVERSION: {{ SALTVERSION }} + URL_BASE: {{ GLOBALS.url_base }} - template: jinja - makedirs: True {% else %}