From f6a0e6285326cd613386c7fdee4f98c830d4187f Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Tue, 8 Apr 2025 09:50:26 -0400 Subject: [PATCH] include managerhype in orch. run hypervisor state before libvirt states --- salt/manager/hypervisor.sls | 2 +- salt/orch/dyanno_hypervisor.sls | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/manager/hypervisor.sls b/salt/manager/hypervisor.sls index 84cd478c8..315775446 100644 --- a/salt/manager/hypervisor.sls +++ b/salt/manager/hypervisor.sls @@ -28,9 +28,9 @@ {% if ssh_user_exists and ssh_keys_exist and base_image_exists and vm_files_exist and hypervisor_host_dir_exists %} # Hypervisor environment is already set up, include the necessary states include: + - hypervisor - libvirt - libvirt.images - - hypervisor hypervisor_setup_verified: test.succeed_without_changes: diff --git a/salt/orch/dyanno_hypervisor.sls b/salt/orch/dyanno_hypervisor.sls index 859e87df6..a47e3c1b6 100644 --- a/salt/orch/dyanno_hypervisor.sls +++ b/salt/orch/dyanno_hypervisor.sls @@ -89,7 +89,7 @@ {% if vm_name and hypervisor and timestamp and status and tag %} write_vm_status: salt.state: - - tgt: 'G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval' + - tgt: 'G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval' - tgt_type: compound - sls: - soc.dyanno.hypervisor.write_status @@ -106,7 +106,7 @@ write_vm_status: # Update hypervisor status update_hypervisor_annotation: salt.state: - - tgt: 'G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval' + - tgt: 'G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone or G@role:so-eval' - tgt_type: compound - sls: - soc.dyanno.hypervisor