osism 0.20250602.0__tar.gz → 0.20250605.0__tar.gz

osism-0.20250605.0/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v0.20250605.0
+-------------
+
+* Use password as default value for remote\_board\_password (#1401)

{osism-0.20250602.0 → osism-0.20250605.0}/Containerfile

@@ -7,7 +7,7 @@ FROM ${IMAGE}:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
 ENV PYTHONWARNINGS="ignore::UserWarning"
 
 COPY . /src
-COPY --from=ghcr.io/astral-sh/uv:0.7.9 /uv /usr/local/bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.7.11 /uv /usr/local/bin/uv
 
 COPY files/data  /data
 COPY files/change.sh /change.sh

{osism-0.20250602.0 → osism-0.20250605.0}/Dockerfile

@@ -7,7 +7,7 @@ FROM ${IMAGE}:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
 ENV PYTHONWARNINGS="ignore::UserWarning"
 
 COPY . /src
-COPY --from=ghcr.io/astral-sh/uv:0.7.9 /uv /usr/local/bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.7.11 /uv /usr/local/bin/uv
 
 COPY files/data  /data
 COPY files/change.sh /change.sh

{osism-0.20250602.0/osism.egg-info → osism-0.20250605.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250602.0
+Version: 0.20250605.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -41,7 +41,7 @@ Requires-Dist: kubernetes==32.0.1
 Requires-Dist: loguru==0.7.3
 Requires-Dist: nbcli==0.10.0.dev2
 Requires-Dist: netmiko==4.5.0
-Requires-Dist: openstacksdk==4.5.0
+Requires-Dist: openstacksdk==4.6.0
 Requires-Dist: pottery==3.0.1
 Requires-Dist: prompt-toolkit==3.0.51
 Requires-Dist: pynetbox==7.5.0

{osism-0.20250602.0 → osism-0.20250605.0}/Pipfile

@@ -25,7 +25,7 @@ kubernetes = "==32.0.1"
 loguru = "==0.7.3"
 nbcli = "0.10.0.dev2"
 netmiko = "==4.5.0"
-openstacksdk = "==4.5.0"
+openstacksdk = "==4.6.0"
 pottery = "==3.0.1"
 prompt-toolkit = "==3.0.51"
 pynetbox = "==7.5.0"

{osism-0.20250602.0 → osism-0.20250605.0}/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "1ff9f04228dbfaeaffb96e1ce0da94559d562d17f9888d8db4b4a759effe22dc"
+            "sha256": "2c0211f42b6765854a69f4900797638c04652c2852298fb20cf1ec26ae0fdf5e"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -1019,12 +1019,12 @@
         },
         "openstacksdk": {
             "hashes": [
-                "sha256:8ee80c594a2b710a3f4dc6a75334455bb8deb40f0bd42a706520210e82efc171",
-                "sha256:ab7a1240207a6969ba09ceee8f16653805730677b4497a806cd956733651fe68"
+                "sha256:0ea54ce3005d48c5134f77dce8df7dd6b4c52d2a103472abc99db19cd4382638",
+                "sha256:e47e166c4732e9aea65228e618d490e4be5df06526a1b95e2d5995d7d0977d3d"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==4.5.0"
+            "markers": "python_version >= '3.10'",
+            "version": "==4.6.0"
         },
         "orderly-set": {
             "hashes": [
@@ -1113,11 +1113,11 @@
         },
         "prometheus-client": {
             "hashes": [
-                "sha256:18da1d2241ac2d10c8d2110f13eedcd5c7c0c8af18c926e8731f04fc10cd575c",
-                "sha256:c8951bbe64e62b96cd8e8f5d917279d1b9b91ab766793f33d4dce6c228558713"
+                "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28",
+                "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==0.22.0"
+            "version": "==0.22.1"
         },
         "prompt-toolkit": {
             "hashes": [
@@ -1335,11 +1335,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
-                "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+                "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+                "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==8.3.5"
+            "markers": "python_version >= '3.9'",
+            "version": "==8.4.0"
         },
         "pytest-testinfra": {
             "hashes": [
@@ -1697,11 +1697,11 @@
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
-                "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+                "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+                "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==4.13.2"
+            "markers": "python_version >= '3.9'",
+            "version": "==4.14.0"
         },
         "typing-inspection": {
             "hashes": [

{osism-0.20250602.0 → osism-0.20250605.0}/osism/commands/baremetal.py

@@ -70,19 +70,18 @@ class BaremetalDeploy(Command):
     def get_parser(self, prog_name):
         parser = super(BaremetalDeploy, self).get_parser(prog_name)
 
-        parser_exc_group = parser.add_mutually_exclusive_group(required=True)
-        parser_exc_group.add_argument(
+        parser.add_argument(
+            "name",
+            nargs="?",
+            type=str,
+            help="Deploy given baremetal node when in provision state available",
+        )
+        parser.add_argument(
             "--all",
             default=False,
             help="Deploy all baremetal nodes in provision state available",
             action="store_true",
         )
-        parser_exc_group.add_argument(
-            "--name",
-            default=[],
-            help="Deploy given baremetal node when in provision state available. May be specified multiple times",
-            action="append",
-        )
         parser.add_argument(
             "--rebuild",
             default=False,
@@ -99,10 +98,14 @@ class BaremetalDeploy(Command):
 
     def take_action(self, parsed_args):
         all_nodes = parsed_args.all
-        names = parsed_args.name
+        name = parsed_args.name
         rebuild = parsed_args.rebuild
         yes_i_really_really_mean_it = parsed_args.yes_i_really_really_mean_it
 
+        if not all_nodes and not name:
+            logger.error("Please specify a node name or use --all")
+            return
+
         if all_nodes and rebuild and not yes_i_really_really_mean_it:
             logger.error(
                 "Please confirm that you wish to rebuild all nodes by specifying '--yes-i-really-really-mean-it'"
@@ -114,14 +117,14 @@ class BaremetalDeploy(Command):
         if all_nodes:
             deploy_nodes = list(conn.baremetal.nodes(details=True))
         else:
-            deploy_nodes = [
-                conn.baremetal.find_node(name, ignore_missing=True, details=True)
-                for name in names
-            ]
+            node = conn.baremetal.find_node(name, ignore_missing=True, details=True)
+            if not node:
+                logger.warning(f"Could not find node {name}")
+                return
+            deploy_nodes = [node]
 
-        for node_idx, node in enumerate(deploy_nodes):
+        for node in deploy_nodes:
             if not node:
-                logger.warning(f"Could not find node {names[node_idx]}")
                 continue
 
             if node.provision_state in ["available", "deploy failed"]:
@@ -176,19 +179,18 @@ class BaremetalUndeploy(Command):
     def get_parser(self, prog_name):
         parser = super(BaremetalUndeploy, self).get_parser(prog_name)
 
-        parser_exc_group = parser.add_mutually_exclusive_group(required=True)
-        parser_exc_group.add_argument(
+        parser.add_argument(
+            "name",
+            nargs="?",
+            type=str,
+            help="Undeploy given baremetal node",
+        )
+        parser.add_argument(
             "--all",
             default=False,
             help="Undeploy all baremetal nodes",
             action="store_true",
         )
-        parser_exc_group.add_argument(
-            "--name",
-            default=[],
-            help="Undeploy given baremetal node. May be specified multiple times",
-            action="append",
-        )
         parser.add_argument(
             "--yes-i-really-really-mean-it",
             default=False,
@@ -199,9 +201,13 @@ class BaremetalUndeploy(Command):
 
     def take_action(self, parsed_args):
         all_nodes = parsed_args.all
-        names = parsed_args.name
+        name = parsed_args.name
         yes_i_really_really_mean_it = parsed_args.yes_i_really_really_mean_it
 
+        if not all_nodes and not name:
+            logger.error("Please specify a node name or use --all")
+            return
+
         if all_nodes and not yes_i_really_really_mean_it:
             logger.error(
                 "Please confirm that you wish to undeploy all nodes by specifying '--yes-i-really-really-mean-it'"
@@ -213,14 +219,14 @@ class BaremetalUndeploy(Command):
         if all_nodes:
             deploy_nodes = list(conn.baremetal.nodes())
         else:
-            deploy_nodes = [
-                conn.baremetal.find_node(name, ignore_missing=True, details=False)
-                for name in names
-            ]
+            node = conn.baremetal.find_node(name, ignore_missing=True, details=False)
+            if not node:
+                logger.warning(f"Could not find node {name}")
+                return
+            deploy_nodes = [node]
 
-        for node_idx, node in enumerate(deploy_nodes):
+        for node in deploy_nodes:
             if not node:
-                logger.warning(f"Could not find node {names[node_idx]}")
                 continue
 
             if node.provision_state in ["active", "deploy failed", "error"]:

{osism-0.20250602.0 → osism-0.20250605.0}/osism/commands/vault.py

@@ -5,6 +5,7 @@
 
 import os
 import subprocess
+import sys
 
 from cliff.command import Command
 from cryptography.fernet import Fernet
@@ -31,7 +32,14 @@ class SetPassword(Command):
 
         f = Fernet(key)
 
-        ansible_vault_password = prompt("Ansible Vault password: ", is_password=True)
+        # Check if password is being piped from STDIN
+        if not sys.stdin.isatty():
+            ansible_vault_password = sys.stdin.read().strip()
+        else:
+            ansible_vault_password = prompt(
+                "Ansible Vault password: ", is_password=True
+            )
+
         redis.set(
             "ansible_vault_password", f.encrypt(ansible_vault_password.encode("utf-8"))
         )

{osism-0.20250602.0 → osism-0.20250605.0}/osism/core/enums.py

@@ -102,6 +102,7 @@ VALIDATE_PLAYBOOKS = {
     "ceph-osds": {"environment": "ceph", "runtime": "osism-ansible"},
     "container-status": {"environment": "generic", "runtime": "osism-ansible"},
     "kernel-version": {"environment": "generic", "runtime": "osism-ansible"},
+    "docker-version": {"environment": "generic", "runtime": "osism-ansible"},
     "kolla-connectivity": {"environment": "kolla", "runtime": "osism-ansible"},
     "mysql-open-files-limit": {"environment": "generic", "runtime": "osism-ansible"},
     "ntp": {"environment": "generic", "runtime": "osism-ansible"},

osism-0.20250605.0/osism/tasks/conductor/__init__.py

@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: Apache-2.0
+
+import copy
+from celery import Celery
+from celery.signals import worker_process_init
+from loguru import logger
+
+from osism.tasks import Config
+from osism.tasks.conductor.config import get_configuration
+from osism.tasks.conductor.ironic import sync_ironic as _sync_ironic
+
+
+# App configuration
+app = Celery("conductor")
+app.config_from_object(Config)
+
+
+@worker_process_init.connect
+def celery_init_worker(**kwargs):
+    pass
+
+
+@app.on_after_configure.connect
+def setup_periodic_tasks(sender, **kwargs):
+    pass
+
+
+# Tasks
+@app.task(bind=True, name="osism.tasks.conductor.get_ironic_parameters")
+def get_ironic_parameters(self):
+    configuration = get_configuration()
+    if "ironic_parameters" in configuration:
+        # NOTE: Do not pass by reference, everybody gets their own copy to work with
+        return copy.deepcopy(configuration["ironic_parameters"])
+
+    return {}
+
+
+@app.task(bind=True, name="osism.tasks.conductor.sync_netbox")
+def sync_netbox(self, force_update=False):
+    logger.info("Not implemented")
+
+
+@app.task(bind=True, name="osism.tasks.conductor.sync_ironic")
+def sync_ironic(self, force_update=False):
+    _sync_ironic(get_ironic_parameters, force_update)
+
+
+__all__ = [
+    "app",
+    "get_ironic_parameters",
+    "sync_netbox",
+    "sync_ironic",
+]

osism-0.20250605.0/osism/tasks/conductor/config.py

@@ -0,0 +1,92 @@
+# SPDX-License-Identifier: Apache-2.0
+
+import uuid
+
+from loguru import logger
+import yaml
+
+from osism.tasks import Config, openstack
+
+
+def is_uuid(value):
+    """Check if a string is a valid UUID."""
+    try:
+        uuid.UUID(value)
+        return True
+    except (ValueError, AttributeError):
+        return False
+
+
+def get_configuration():
+    with open("/etc/conductor.yml") as fp:
+        configuration = yaml.load(fp, Loader=yaml.SafeLoader)
+
+        if not configuration:
+            logger.warning(
+                "The conductor configuration is empty. That's probably wrong"
+            )
+            return {}
+
+        if Config.enable_ironic.lower() not in ["true", "yes"]:
+            return configuration
+
+        if "ironic_parameters" not in configuration:
+            logger.error("ironic_parameters not found in the conductor configuration")
+            return configuration
+
+        if "instance_info" in configuration["ironic_parameters"]:
+            if "image_source" in configuration["ironic_parameters"]["instance_info"]:
+                image_source = configuration["ironic_parameters"]["instance_info"][
+                    "image_source"
+                ]
+                if not is_uuid(image_source):
+                    result = openstack.image_get(image_source)
+                    configuration["ironic_parameters"]["instance_info"][
+                        "image_source"
+                    ] = result.id
+
+        if "driver_info" in configuration["ironic_parameters"]:
+            if "deploy_kernel" in configuration["ironic_parameters"]["driver_info"]:
+                deploy_kernel = configuration["ironic_parameters"]["driver_info"][
+                    "deploy_kernel"
+                ]
+                if not is_uuid(deploy_kernel):
+                    result = openstack.image_get(deploy_kernel)
+                    configuration["ironic_parameters"]["driver_info"][
+                        "deploy_kernel"
+                    ] = result.id
+
+            if "deploy_ramdisk" in configuration["ironic_parameters"]["driver_info"]:
+                deploy_ramdisk = configuration["ironic_parameters"]["driver_info"][
+                    "deploy_ramdisk"
+                ]
+                if not is_uuid(deploy_ramdisk):
+                    result = openstack.image_get(deploy_ramdisk)
+                    configuration["ironic_parameters"]["driver_info"][
+                        "deploy_ramdisk"
+                    ] = result.id
+
+            if "cleaning_network" in configuration["ironic_parameters"]["driver_info"]:
+                result = openstack.network_get(
+                    configuration["ironic_parameters"]["driver_info"][
+                        "cleaning_network"
+                    ]
+                )
+                configuration["ironic_parameters"]["driver_info"][
+                    "cleaning_network"
+                ] = result.id
+
+            if (
+                "provisioning_network"
+                in configuration["ironic_parameters"]["driver_info"]
+            ):
+                result = openstack.network_get(
+                    configuration["ironic_parameters"]["driver_info"][
+                        "provisioning_network"
+                    ]
+                )
+                configuration["ironic_parameters"]["driver_info"][
+                    "provisioning_network"
+                ] = result.id
+
+        return configuration

osism-0.20250602.0/osism/tasks/conductor.py → osism-0.20250605.0/osism/tasks/conductor/ironic.py

@@ -1,210 +1,39 @@
 # SPDX-License-Identifier: Apache-2.0
 
-from ansible import constants as ansible_constants
-from ansible.parsing.vault import VaultLib, VaultSecret
-from celery import Celery
-from celery.signals import worker_process_init
-import copy
 import ipaddress
+import json
+
 import jinja2
 from loguru import logger
 from pottery import Redlock
-import yaml
-import json
-
-from osism import settings
-from osism import utils
-from osism.tasks import Config, netbox, openstack
-
-app = Celery("conductor")
-app.config_from_object(Config)
-
-
-configuration = {}
-
-
-def get_nb_device_query_list():
-    try:
-        supported_nb_device_filters = [
-            "site",
-            "region",
-            "site_group",
-            "location",
-            "rack",
-            "tag",
-            "state",
-        ]
-        nb_device_query_list = yaml.safe_load(settings.NETBOX_FILTER_CONDUCTOR)
-        if type(nb_device_query_list) is not list:
-            raise TypeError
-        for nb_device_query in nb_device_query_list:
-            if type(nb_device_query) is not dict:
-                raise TypeError
-            for key in list(nb_device_query.keys()):
-                if key not in supported_nb_device_filters:
-                    raise ValueError
-                # NOTE: Only "location_id" and "rack_id" are supported by netbox
-                if key in ["location", "rack"]:
-                    value_name = nb_device_query.pop(key, "")
-                    if key == "location":
-                        value_id = netbox.get_location_id(value_name)
-                    elif key == "rack":
-                        value_id = netbox.get_rack_id(value_name)
-                    if value_id:
-                        nb_device_query.update({key + "_id": value_id})
-                    else:
-                        raise ValueError(f"Invalid name {value_name} for {key}")
-    except (yaml.YAMLError, TypeError):
-        logger.error(
-            f"Setting NETBOX_FILTER_CONDUCTOR needs to be an array of mappings containing supported netbox device filters: {supported_nb_device_filters}"
-        )
-        nb_device_query_list = []
-    except ValueError as exc:
-        logger.error(f"Unknown value in NETBOX_FILTER_CONDUCTOR: {exc}")
-        nb_device_query_list = []
-
-    return nb_device_query_list
-
-
-def get_configuration():
-    with open("/etc/conductor.yml") as fp:
-        configuration = yaml.load(fp, Loader=yaml.SafeLoader)
-
-        if not configuration:
-            logger.warning(
-                "The conductor configuration is empty. That's probably wrong"
-            )
-            return {}
-
-        if Config.enable_ironic.lower() not in ["true", "yes"]:
-            return configuration
-
-        if "ironic_parameters" not in configuration:
-            logger.error("ironic_parameters not found in the conductor configuration")
-            return configuration
-
-        if "driver_info" in configuration["ironic_parameters"]:
-            if "deploy_kernel" in configuration["ironic_parameters"]["driver_info"]:
-                result = openstack.image_get(
-                    configuration["ironic_parameters"]["driver_info"]["deploy_kernel"]
-                )
-                configuration["ironic_parameters"]["driver_info"][
-                    "deploy_kernel"
-                ] = result.id
-
-            if "deploy_ramdisk" in configuration["ironic_parameters"]["driver_info"]:
-                result = openstack.image_get(
-                    configuration["ironic_parameters"]["driver_info"]["deploy_ramdisk"]
-                )
-                configuration["ironic_parameters"]["driver_info"][
-                    "deploy_ramdisk"
-                ] = result.id
-
-            if "cleaning_network" in configuration["ironic_parameters"]["driver_info"]:
-                result = openstack.network_get(
-                    configuration["ironic_parameters"]["driver_info"][
-                        "cleaning_network"
-                    ]
-                )
-                configuration["ironic_parameters"]["driver_info"][
-                    "cleaning_network"
-                ] = result.id
-
-            if (
-                "provisioning_network"
-                in configuration["ironic_parameters"]["driver_info"]
-            ):
-                result = openstack.network_get(
-                    configuration["ironic_parameters"]["driver_info"][
-                        "provisioning_network"
-                    ]
-                )
-                configuration["ironic_parameters"]["driver_info"][
-                    "provisioning_network"
-                ] = result.id
-
-        return configuration
-
-
-@worker_process_init.connect
-def celery_init_worker(**kwargs):
-    global configuration
-    configuration = get_configuration()
-
-
-@app.on_after_configure.connect
-def setup_periodic_tasks(sender, **kwargs):
-    pass
-
-
-@app.task(bind=True, name="osism.tasks.conductor.get_ironic_parameters")
-def get_ironic_parameters(self):
-    if "ironic_parameters" in configuration:
-        # NOTE: Do not pass by reference, everybody gets their own copy to work with
-        return copy.deepcopy(configuration["ironic_parameters"])
-
-    return {}
-
-
-@app.task(bind=True, name="osism.tasks.conductor.sync_netbox")
-def sync_netbox(self, force_update=False):
-    logger.info("Not implemented")
-
-
-@app.task(bind=True, name="osism.tasks.conductor.sync_ironic")
-def sync_ironic(self, force_update=False):
-    def deep_compare(a, b, updates):
-        """
-        Find items in a that do not exist in b or are different.
-        Write required changes into updates
-        """
-        for key, value in a.items():
-            if type(value) is not dict:
-                if key not in b or b[key] != value:
-                    updates[key] = value
-            else:
-                updates[key] = {}
-                deep_compare(a[key], b[key], updates[key])
-                if not updates[key]:
-                    updates.pop(key)
-
-    def deep_merge(a, b):
-        for key, value in b.items():
-            if value == "DELETE":
-                # NOTE: Use special string to remove keys
-                a.pop(key, None)
-            elif (
-                key not in a.keys()
-                or not isinstance(a[key], dict)
-                or not isinstance(value, dict)
-            ):
-                a[key] = value
-            else:
-                deep_merge(a[key], value)
-
-    def deep_decrypt(a, vault):
-        for key, value in list(a.items()):
-            if not isinstance(value, dict):
-                if vault.is_encrypted(value):
-                    try:
-                        a[key] = vault.decrypt(value).decode()
-                    except Exception:
-                        a.pop(key, None)
-            else:
-                deep_decrypt(a[key], vault)
-
-    driver_params = {
-        "ipmi": {
-            "address": "ipmi_address",
-            "port": "ipmi_port",
-            "password": "ipmi_password",
-        },
-        "redfish": {
-            "address": "redfish_address",
-            "password": "redfish_password",
-        },
-    }
 
+from osism import utils as osism_utils
+from osism.tasks import netbox, openstack
+from osism.tasks.conductor.netbox import get_nb_device_query_list
+from osism.tasks.conductor.utils import (
+    deep_compare,
+    deep_decrypt,
+    deep_merge,
+    get_vault,
+)
+
+
+driver_params = {
+    "ipmi": {
+        "address": "ipmi_address",
+        "port": "ipmi_port",
+        "password": "ipmi_password",
+        "username": "ipmi_username",
+    },
+    "redfish": {
+        "address": "redfish_address",
+        "password": "redfish_password",
+        "username": "redfish_username",
+    },
+}
+
+
+def sync_ironic(get_ironic_parameters, force_update=False):
     devices = set()
     nb_device_query_list = get_nb_device_query_list()
     for nb_device_query in nb_device_query_list:
@@ -248,27 +77,22 @@ def sync_ironic(self, force_update=False):
         ):
             # NOTE: Update node attributes with overrides from netbox device
             deep_merge(node_attributes, device.custom_fields["ironic_parameters"])
+
         # NOTE: Decrypt ansible vaulted secrets
-        try:
-            vault_secret = utils.get_ansible_vault_password()
-            vault = VaultLib(
-                [
-                    (
-                        ansible_constants.DEFAULT_VAULT_ID_MATCH,
-                        VaultSecret(vault_secret.encode()),
-                    )
-                ]
-            )
-        except Exception:
-            logger.error("Unable to get vault secret. Dropping encrypted entries")
-            vault = VaultLib()
+        vault = get_vault()
         deep_decrypt(node_attributes, vault)
+
+        node_secrets = device.custom_fields.get("secrets", {})
+        if node_secrets is None:
+            node_secrets = {}
+        deep_decrypt(node_secrets, vault)
+
         if (
             "driver" in node_attributes
             and node_attributes["driver"] in driver_params.keys()
         ):
             if "driver_info" in node_attributes:
-                # NOTE: Pop all fields belonging to a different driver
+                # NOTE: Remove all fields belonging to a different driver
                 unused_drivers = [
                     driver
                     for driver in driver_params.keys()
@@ -278,6 +102,33 @@ def sync_ironic(self, force_update=False):
                     for driver in unused_drivers:
                         if key.startswith(driver + "_"):
                             node_attributes["driver_info"].pop(key, None)
+
+                # NOTE: Render driver username field
+                username_key = driver_params[node_attributes["driver"]]["username"]
+                if username_key in node_attributes["driver_info"]:
+                    node_attributes["driver_info"][username_key] = (
+                        jinja2.Environment(loader=jinja2.BaseLoader())
+                        .from_string(node_attributes["driver_info"][username_key])
+                        .render(
+                            remote_board_username=str(
+                                node_secrets.get("remote_board_username", "admin")
+                            )
+                        )
+                    )
+
+                # NOTE: Render driver password field
+                password_key = driver_params[node_attributes["driver"]]["password"]
+                if password_key in node_attributes["driver_info"]:
+                    node_attributes["driver_info"][password_key] = (
+                        jinja2.Environment(loader=jinja2.BaseLoader())
+                        .from_string(node_attributes["driver_info"][password_key])
+                        .render(
+                            remote_board_password=str(
+                                node_secrets.get("remote_board_password", "password")
+                            )
+                        )
+                    )
+
                 # NOTE: Render driver address field
                 address_key = driver_params[node_attributes["driver"]]["address"]
                 if address_key in node_attributes["driver_info"]:
@@ -335,7 +186,7 @@ def sync_ironic(self, force_update=False):
 
         lock = Redlock(
             key=f"lock_osism_tasks_conductor_sync_ironic-{device.name}",
-            masters={utils.redis},
+            masters={osism_utils.redis},
             auto_release_time=600,
         )
         if lock.acquire(timeout=120):

osism-0.20250605.0/osism/tasks/conductor/netbox.py

@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: Apache-2.0
+
+from loguru import logger
+import yaml
+
+from osism import settings
+from osism.tasks import netbox
+
+
+def get_nb_device_query_list():
+    try:
+        supported_nb_device_filters = [
+            "site",
+            "region",
+            "site_group",
+            "location",
+            "rack",
+            "tag",
+            "state",
+        ]
+        nb_device_query_list = yaml.safe_load(settings.NETBOX_FILTER_CONDUCTOR)
+        if type(nb_device_query_list) is not list:
+            raise TypeError
+        for nb_device_query in nb_device_query_list:
+            if type(nb_device_query) is not dict:
+                raise TypeError
+            for key in list(nb_device_query.keys()):
+                if key not in supported_nb_device_filters:
+                    raise ValueError
+                # NOTE: Only "location_id" and "rack_id" are supported by netbox
+                if key in ["location", "rack"]:
+                    value_name = nb_device_query.pop(key, "")
+                    if key == "location":
+                        value_id = netbox.get_location_id(value_name)
+                    elif key == "rack":
+                        value_id = netbox.get_rack_id(value_name)
+                    if value_id:
+                        nb_device_query.update({key + "_id": value_id})
+                    else:
+                        raise ValueError(f"Invalid name {value_name} for {key}")
+    except (yaml.YAMLError, TypeError):
+        logger.error(
+            f"Setting NETBOX_FILTER_CONDUCTOR needs to be an array of mappings containing supported netbox device filters: {supported_nb_device_filters}"
+        )
+        nb_device_query_list = []
+    except ValueError as exc:
+        logger.error(f"Unknown value in NETBOX_FILTER_CONDUCTOR: {exc}")
+        nb_device_query_list = []
+
+    return nb_device_query_list

osism-0.20250605.0/osism/tasks/conductor/utils.py

@@ -0,0 +1,79 @@
+# SPDX-License-Identifier: Apache-2.0
+
+from ansible import constants as ansible_constants
+from ansible.parsing.vault import VaultLib, VaultSecret
+from loguru import logger
+
+from osism import utils
+
+
+def deep_compare(a, b, updates):
+    """
+    Find items in a that do not exist in b or are different.
+    Write required changes into updates
+    """
+    for key, value in a.items():
+        if type(value) is not dict:
+            if key not in b or b[key] != value:
+                updates[key] = value
+        else:
+            updates[key] = {}
+            deep_compare(a[key], b[key], updates[key])
+            if not updates[key]:
+                updates.pop(key)
+
+
+def deep_merge(a, b):
+    for key, value in b.items():
+        if value == "DELETE":
+            # NOTE: Use special string to remove keys
+            a.pop(key, None)
+        elif (
+            key not in a.keys()
+            or not isinstance(a[key], dict)
+            or not isinstance(value, dict)
+        ):
+            a[key] = value
+        else:
+            deep_merge(a[key], value)
+
+
+def deep_decrypt(a, vault):
+    if a is None:
+        return
+    if isinstance(a, dict):
+        for key, value in list(a.items()):
+            if isinstance(value, (dict, list)):
+                deep_decrypt(a[key], vault)
+            elif vault.is_encrypted(value):
+                try:
+                    a[key] = vault.decrypt(value).decode()
+                except Exception:
+                    a.pop(key, None)
+    elif isinstance(a, list):
+        for i, item in enumerate(a):
+            if isinstance(item, (dict, list)):
+                deep_decrypt(item, vault)
+            elif vault.is_encrypted(item):
+                try:
+                    a[i] = vault.decrypt(item).decode()
+                except Exception:
+                    pass
+
+
+def get_vault():
+    """Create and return a VaultLib instance for decrypting secrets"""
+    try:
+        vault_secret = utils.get_ansible_vault_password()
+        vault = VaultLib(
+            [
+                (
+                    ansible_constants.DEFAULT_VAULT_ID_MATCH,
+                    VaultSecret(vault_secret.encode()),
+                )
+            ]
+        )
+    except Exception:
+        logger.error("Unable to get vault secret. Dropping encrypted entries")
+        vault = VaultLib()
+    return vault

osism-0.20250605.0/osism/tasks/conductor.py

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+
+from osism.tasks.conductor import (
+    app,
+    get_ironic_parameters,
+    sync_netbox,
+    sync_ironic,
+)
+
+__all__ = [
+    "app",
+    "get_ironic_parameters",
+    "sync_netbox",
+    "sync_ironic",
+]

{osism-0.20250602.0 → osism-0.20250605.0/osism.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250602.0
+Version: 0.20250605.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -41,7 +41,7 @@ Requires-Dist: kubernetes==32.0.1
 Requires-Dist: loguru==0.7.3
 Requires-Dist: nbcli==0.10.0.dev2
 Requires-Dist: netmiko==4.5.0
-Requires-Dist: openstacksdk==4.5.0
+Requires-Dist: openstacksdk==4.6.0
 Requires-Dist: pottery==3.0.1
 Requires-Dist: prompt-toolkit==3.0.51
 Requires-Dist: pynetbox==7.5.0

{osism-0.20250602.0 → osism-0.20250605.0}/osism.egg-info/SOURCES.txt

@@ -81,6 +81,11 @@ osism/tasks/kubernetes.py
 osism/tasks/netbox.py
 osism/tasks/openstack.py
 osism/tasks/reconciler.py
+osism/tasks/conductor/__init__.py
+osism/tasks/conductor/config.py
+osism/tasks/conductor/ironic.py
+osism/tasks/conductor/netbox.py
+osism/tasks/conductor/utils.py
 osism/utils/__init__.py
 playbooks/build.yml
 playbooks/pre.yml

osism-0.20250605.0/osism.egg-info/pbr.json

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

{osism-0.20250602.0 → osism-0.20250605.0}/osism.egg-info/requires.txt

@@ -18,7 +18,7 @@ kubernetes==32.0.1
 loguru==0.7.3
 nbcli==0.10.0.dev2
 netmiko==4.5.0
-openstacksdk==4.5.0
+openstacksdk==4.6.0
 pottery==3.0.1
 prompt-toolkit==3.0.51
 pynetbox==7.5.0

{osism-0.20250602.0 → osism-0.20250605.0}/requirements.txt

@@ -18,7 +18,7 @@ kubernetes==32.0.1
 loguru==0.7.3
 nbcli==0.10.0.dev2
 netmiko==4.5.0
-openstacksdk==4.5.0
+openstacksdk==4.6.0
 pottery==3.0.1
 prompt-toolkit==3.0.51
 pynetbox==7.5.0

osism-0.20250602.0/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v0.20250602.0
--------------
-
-* Allow to change task timeout via OSISM\_TASK\_TIMEOUT environment variable (#1387)

osism-0.20250602.0/osism.egg-info/pbr.json

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