osism 0.20251003.0__py3-none-any.whl → 0.20251004.0__py3-none-any.whl

osism/tasks/__init__.py

@@ -13,6 +13,9 @@ from loguru import logger
 
 from osism import utils
 
+# Regex pattern for extracting hosts from Ansible output
+HOST_PATTERN = re.compile(r"^(ok|changed|failed|skipping|unreachable):\s+\[([^\]]+)\]")
+
 
 class Config:
     broker_connection_retry_on_startup = True
@@ -88,7 +91,7 @@ def get_container_version(worker):
 
 
 def log_play_execution(
-    request_id, worker, environment, role, hosts=None, result="started"
+    request_id, worker, environment, role, hosts=None, arguments=None, result="started"
 ):
     """Log Ansible play execution to central tracking file.
 
@@ -98,6 +101,7 @@ def log_play_execution(
         environment: The environment parameter
         role: The playbook/role that was executed
         hosts: List of hosts the play was executed against (default: empty list)
+        arguments: Command-line arguments passed to ansible-playbook (default: None)
         result: Execution result - "started", "success", or "failure"
     """
     log_file = Path("/share/ansible-execution-history.json")
@@ -105,6 +109,10 @@ def log_play_execution(
     # Get runtime version from YAML version file
     runtime_version = get_container_version(worker)
 
+    # Use provided hosts or empty list
+    if hosts is None:
+        hosts = []
+
     execution_record = {
         "timestamp": datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
         "request_id": request_id,
@@ -112,7 +120,8 @@ def log_play_execution(
         "worker_version": runtime_version,
         "environment": environment,
         "role": role,
-        "hosts": hosts if isinstance(hosts, list) else [],
+        "hosts": hosts,
+        "arguments": arguments if arguments else "",
         "result": result,
     }
 
@@ -143,6 +152,7 @@ def run_ansible_in_environment(
     auto_release_time=3600,
 ):
     result = ""
+    extracted_hosts = set()  # Local set for host deduplication
 
     if type(arguments) == list:
         joined_arguments = " ".join(arguments)
@@ -181,7 +191,8 @@ def run_ansible_in_environment(
         worker=worker,
         environment=environment,
         role=role,
-        hosts=None,  # Host extraction would require inventory parsing
+        hosts=None,  # Hosts will be empty at start, filled at completion
+        arguments=joined_arguments,
         result="started",
     )
 
@@ -269,6 +280,13 @@ def run_ansible_in_environment(
 
     while p.poll() is None:
         line = p.stdout.readline().decode("utf-8")
+
+        # Extract hosts from Ansible output
+        match = HOST_PATTERN.match(line.strip())
+        if match:
+            hostname = match.group(2)
+            extracted_hosts.add(hostname)  # Local set (automatic deduplication)
+
         if publish:
             utils.push_task_output(request_id, line)
         result += line
@@ -281,7 +299,8 @@ def run_ansible_in_environment(
         worker=worker,
         environment=environment,
         role=role,
-        hosts=None,  # Host extraction would require inventory parsing
+        hosts=sorted(list(extracted_hosts)),  # Direct pass of extracted hosts
+        arguments=joined_arguments,
         result="success" if rc == 0 else "failure",
     )
 

{osism-0.20251003.0.dist-info → osism-0.20251004.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20251003.0
+Version: 0.20251004.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH

{osism-0.20251003.0.dist-info → osism-0.20251004.0.dist-info}/RECORD

@@ -38,7 +38,7 @@ osism/services/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
 osism/services/event_bridge.py,sha256=roV90o9UgTnwoVbXnPR3muBk04IriVYCO_fewZ46Mq8,12016
 osism/services/listener.py,sha256=O8Xq5fEEVoNFIgFPE7GqfVqx6C4QkdWhUPUGzODFnws,14211
 osism/services/websocket_manager.py,sha256=F147kWOg8PAvbVG4aVYQVtK4mFMfPVtHxxYJXaqiAjg,11051
-osism/tasks/__init__.py,sha256=l-tzKk4QxRCD8PxNhHS6SdNgDa2Ilr10HZc3FN5HZH4,13089
+osism/tasks/__init__.py,sha256=l_a7IfYm_NUn6XOokfJBYjTuMZGyvGHcvDUOMWSeYGo,13814
 osism/tasks/ansible.py,sha256=wAeFqyY8EavySpOIBSgWwK3HcGXWPZCIVOaSss5irCM,1387
 osism/tasks/ceph.py,sha256=Zo-92rzbJ9NDH9dbKi_JPWwekO3cYTdbmwAGSwr5l0w,726
 osism/tasks/conductor.py,sha256=WBLsoPtr0iGUzRGERs0Xt7CMYrnHQVEwNV9qXBssI3s,274
@@ -65,11 +65,11 @@ osism/tasks/conductor/sonic/interface.py,sha256=M876LHdFqGxUfTizzDusdzvCkDI0vCgq
 osism/tasks/conductor/sonic/sync.py,sha256=fpgsQVwq6Hb7eeDHhLkAqx5BkaK3Ce_m_WvmWEsJyOo,9182
 osism/utils/__init__.py,sha256=IEr0sR1HKg-QI_u84fs4gMldC6-EPSxvMBh2zMGu5dU,9939
 osism/utils/ssh.py,sha256=nxeEgwjJWvQCybKDp-NelMeWyODCYpaXFCBchAv4-bg,8691
-osism-0.20251003.0.dist-info/licenses/AUTHORS,sha256=oWotd63qsnNR945QLJP9mEXaXNtCMaesfo8ZNuLjwpU,39
-osism-0.20251003.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-osism-0.20251003.0.dist-info/METADATA,sha256=Km5pxS6evxg2a_I6MBDbX5PA8BZbRweyt4fWtSgP85M,2971
-osism-0.20251003.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-osism-0.20251003.0.dist-info/entry_points.txt,sha256=W45YQ7MJ7BCAPZXl3F6d2FSi6An0moZQbzLn_BwGnRE,4618
-osism-0.20251003.0.dist-info/pbr.json,sha256=OKB9yQU8MRrWVMUvBfcaJlhCTJLe5o6nxgVl2sh5qxQ,47
-osism-0.20251003.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
-osism-0.20251003.0.dist-info/RECORD,,
+osism-0.20251004.0.dist-info/licenses/AUTHORS,sha256=oWotd63qsnNR945QLJP9mEXaXNtCMaesfo8ZNuLjwpU,39
+osism-0.20251004.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+osism-0.20251004.0.dist-info/METADATA,sha256=AyzRodVxbpGRzpJZM9nl7_8BBf-iAjb25mOWR8sl3UM,2971
+osism-0.20251004.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+osism-0.20251004.0.dist-info/entry_points.txt,sha256=W45YQ7MJ7BCAPZXl3F6d2FSi6An0moZQbzLn_BwGnRE,4618
+osism-0.20251004.0.dist-info/pbr.json,sha256=O4D8iZGKdlEwIsuOJIdJnESPh6JYeG__nO6RBvorNPU,47
+osism-0.20251004.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
+osism-0.20251004.0.dist-info/RECORD,,

osism-0.20251004.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "e546bf8", "is_release": false}

osism-0.20251003.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "fc7b5e0", "is_release": false}