From 1f5f283c06579765fa2ffbfc92faedf0cd6b385e Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Thu, 20 Nov 2025 16:53:55 -0500 Subject: [PATCH] update hypervisor annotaion. preinit instead of initialized --- salt/_runners/setup_hypervisor.py | 4 ++-- salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/_runners/setup_hypervisor.py b/salt/_runners/setup_hypervisor.py index 7d521bd62..a123a1501 100644 --- a/salt/_runners/setup_hypervisor.py +++ b/salt/_runners/setup_hypervisor.py @@ -489,7 +489,7 @@ def _ensure_hypervisor_host_dir(minion_id: str = None): log.error(f"Error creating hypervisor host directory: {str(e)}") return False -def _apply_dyanno_hypervisor_state(status='Initialized'): +def _apply_dyanno_hypervisor_state(status): """ Apply the soc.dyanno.hypervisor state on the salt master. @@ -734,7 +734,7 @@ def setup_environment(vm_name: str = 'sool9', disk_size: str = '220G', minion_id # Update hypervisor annotation with success status if success: - _apply_dyanno_hypervisor_state('Initialized') + _apply_dyanno_hypervisor_state('PreInit') else: _apply_dyanno_hypervisor_state('SetupFailed') diff --git a/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja b/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja index 97170a55f..966f8838d 100644 --- a/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja +++ b/salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja @@ -55,10 +55,10 @@ SSH key setup failed. Please check the salt-master log for details. #### WARNING Setup failed. Please check the salt-master log for details. -{%- else %} +{%- elif baseDomainStatus == 'PreInit' %} #### WARNING -Base domain has not been initialized. +Base domain has not been initialized. Waiting for hypervisor to highstate. {%- endif %} {%- endmacro -%}