bunny-lab/Borealis-Github-Replica
1
0
Fork 0
mirror of https://github.com/bunny-lab-io/Borealis.git synced 2025-10-26 22:01:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for further Ansible Playbook Troubleshooting

Browse Source
This commit is contained in:
Nicole Rappe
2025-10-09 15:36:47 -06:00
parent fca87a5637
commit b6eac6a112
4 changed files with 531 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Data/Server/job_scheduler.py
View File

@@ -475,10 +475,33 @@ class JobScheduler:
os.path.join(os.path.dirname(__file__), "..", "..", "Assemblies", "Ansible_Playbooks")
)
def _dispatch_ansible(self, hostname: str, rel_path: str, scheduled_job_id: int, scheduled_run_id: int) -> Optional[Dict[str, Any]]:
def _dispatch_ansible(self, hostname: str, component: Dict[str, Any], scheduled_job_id: int, scheduled_run_id: int) -> Optional[Dict[str, Any]]:
try:
import os, json, uuid
import os, uuid
ans_root = self._ansible_root()
rel_path = ""
overrides_map: Dict[str, Any] = {}
if isinstance(component, dict):
rel_path = component.get("path") or component.get("playbook_path") or component.get("script_path") or ""
raw_overrides = component.get("variable_values")
if isinstance(raw_overrides, dict):
for key, val in raw_overrides.items():
name = str(key or "").strip()
if not name:
continue
overrides_map[name] = val
comp_vars = component.get("variables")
if isinstance(comp_vars, list):
for var in comp_vars:
if not isinstance(var, dict):
continue
name = str(var.get("name") or "").strip()
if not name or name in overrides_map:
continue
if "value" in var:
overrides_map[name] = var.get("value")
else:
rel_path = str(component or "")
rel_norm = (rel_path or "").replace("\\", "/").lstrip("/")
abs_path = os.path.abspath(os.path.join(ans_root, rel_norm))
if (not abs_path.startswith(ans_root)) or (not os.path.isfile(abs_path)):
@@ -528,6 +551,7 @@ class JobScheduler:
"connection": "winrm",
"variables": variables,
"files": files,
"variable_values": overrides_map,
}
try:
self.socketio.emit("ansible_playbook_run", payload)
@@ -908,7 +932,7 @@ class JobScheduler:
except Exception:
comps = []
script_components = []
ansible_paths = []
ansible_components = []
for c in comps:
try:
ctype = (c or {}).get("type")
@@ -921,7 +945,9 @@ class JobScheduler:
elif ctype == "ansible":
p = (c.get("path") or "").strip()
if p:
ansible_paths.append(p)
comp_copy = dict(c)
comp_copy["path"] = p
ansible_components.append(comp_copy)
except Exception:
continue
run_mode = (execution_context or "system").strip().lower()
@@ -1027,9 +1053,9 @@ class JobScheduler:
except Exception:
continue
# Dispatch ansible playbooks for this job to the target host
for ap in ansible_paths:
for comp in ansible_components:
try:
link = self._dispatch_ansible(host, ap, job_id, run_row_id)
link = self._dispatch_ansible(host, comp, job_id, run_row_id)
if link and link.get("activity_id"):
activity_links.append({
"run_id": run_row_id,

9
Data/Server/server.py
View File

@@ -5045,6 +5045,14 @@ def ansible_quick_run():
variables = doc.get('variables') if isinstance(doc.get('variables'), list) else []
files = doc.get('files') if isinstance(doc.get('files'), list) else []
friendly_name = (doc.get("name") or "").strip() or os.path.basename(abs_path)
overrides_raw = data.get("variable_values")
variable_values = {}
if isinstance(overrides_raw, dict):
for key, val in overrides_raw.items():
name = str(key or "").strip()
if not name:
continue
variable_values[name] = val
results = []
for host in hostnames:
@@ -5091,6 +5099,7 @@ def ansible_quick_run():
"variables": variables,
"files": files,
"activity_job_id": job_id,
"variable_values": variable_values,
}
try:
_ansible_log_server(f"[quick_run] emit ansible_playbook_run host='{host}' run_id={run_id} job_id={job_id} path={rel_path}")