osism 0.20250425.0__py3-none-any.whl → 0.20250514.0__py3-none-any.whl

osism/api.py

@@ -41,7 +41,7 @@ class WebhookNetboxData(BaseModel):
 class LogConfig(BaseModel):
     """Logging configuration to be set for the server"""
 
-    LOGGER_NAME: str = "mycoolapp"
+    LOGGER_NAME: str = "osism"
     LOG_FORMAT: str = "%(levelprefix)s | %(asctime)s | %(message)s"
     LOG_LEVEL: str = "DEBUG"
 

osism/commands/apply.py

@@ -116,7 +116,7 @@ class Run(Command):
         if format == "log":
             for c in t.children:
                 logger.info(
-                    f"Task {c.task_id} is running in background. No more output. Check ARA for logs."
+                    f"Task {c.task_id} (loadbalancer) is running in background. No more output. Check ARA for logs."
                 )
 
         # As explained above, it is neceesary to wait for all tasks.

osism/commands/configuration.py

@@ -23,9 +23,11 @@ class Sync(Command):
             "manager", "configuration", arguments, auto_release_time=60
         )
 
-        logger.info(f"Task {t.task_id} was prepared for execution.")
         logger.info(
-            f"It takes a moment until task {t.task_id} has been started and output is visible here."
+            f"Task {t.task_id} (sync configuration) was prepared for execution."
+        )
+        logger.info(
+            f"It takes a moment until task {t.task_id} (sync configuration) has been started and output is visible here."
         )
 
         rc = handle_task(t, True, format, 60)

osism/commands/manage.py

@@ -12,7 +12,7 @@ import requests
 from osism.data import TEMPLATE_IMAGE_CLUSTERAPI, TEMPLATE_IMAGE_OCTAVIA
 from osism.tasks import openstack, handle_task
 
-SUPPORTED_CLUSTERAPI_K8S_IMAGES = ["1.30", "1.31", "1.32"]
+SUPPORTED_CLUSTERAPI_K8S_IMAGES = ["1.31", "1.32", "1.33"]
 
 
 class ImageClusterapi(Command):

osism/commands/netbox.py

@@ -1,9 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
+import os
+import subprocess
+
 from cliff.command import Command
 from loguru import logger
+import yaml
 
-from osism.tasks import conductor, netbox, reconciler, handle_task
+from osism.tasks import conductor, netbox, handle_task
 
 
 class Ironic(Command):
@@ -28,26 +32,9 @@ class Ironic(Command):
             force_update=parsed_args.force_update
         )
         if wait:
-            logger.info(f"Task {task.task_id} is running. Wait. No more output.")
-            task.wait(timeout=None, interval=0.5)
-
-
-class Sync(Command):
-    def get_parser(self, prog_name):
-        parser = super(Sync, self).get_parser(prog_name)
-        parser.add_argument(
-            "--no-wait",
-            help="Do not wait until the sync has been completed",
-            action="store_true",
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        wait = not parsed_args.no_wait
-
-        task = reconciler.sync_inventory_with_netbox.delay()
-        if wait:
-            logger.info(f"Task {task.task_id} is running. Wait. No more output.")
+            logger.info(
+                f"Task {task.task_id} (sync ironic) is running. Wait. No more output."
+            )
             task.wait(timeout=None, interval=0.5)
 
 
@@ -140,9 +127,9 @@ class Manage(Command):
         return handle_task(task, wait, format="script", timeout=3600)
 
 
-class Ping(Command):
+class Versions(Command):
     def get_parser(self, prog_name):
-        parser = super(Ping, self).get_parser(prog_name)
+        parser = super(Versions, self).get_parser(prog_name)
         return parser
 
     def take_action(self, parsed_args):
@@ -150,3 +137,65 @@ class Ping(Command):
         task.wait(timeout=None, interval=0.5)
         result = task.get()
         print(result)
+
+
+class Console(Command):
+    def get_parser(self, prog_name):
+        parser = super(Console, self).get_parser(prog_name)
+        parser.add_argument(
+            "type",
+            nargs=1,
+            choices=["info", "search", "filter", "shell"],
+            help="Type of the console (default: %(default)s)",
+        )
+        parser.add_argument(
+            "arguments", nargs="*", type=str, default="", help="Additional arguments"
+        )
+
+        return parser
+
+    def take_action(self, parsed_args):
+        type_console = parsed_args.type[0]
+        arguments = " ".join(
+            [f"'{item}'" if " " in item else item for item in parsed_args.arguments]
+        )
+
+        home_dir = os.path.expanduser("~")
+        nbcli_dir = os.path.join(home_dir, ".nbcli")
+        if not os.path.exists(nbcli_dir):
+            os.mkdir(nbcli_dir)
+
+        nbcli_file = os.path.join(nbcli_dir, "user_config.yml")
+        if not os.path.exists(nbcli_file):
+            try:
+                with open("/run/secrets/NETBOX_TOKEN", "r") as fp:
+                    token = fp.read().strip()
+            except FileNotFoundError:
+                token = None
+
+            url = os.environ.get("NETBOX_API", None)
+
+            if not token or not url:
+                logger.error("Netbox integration not configured.")
+                return
+
+            subprocess.call(
+                ["/usr/local/bin/nbcli", "init"],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+            os.remove(nbcli_file)
+
+            nbcli_config = {
+                "pynetbox": {
+                    "url": url,
+                    "token": token,
+                },
+                "requests": {"verify": False},
+                "nbcli": {"filter_limit": 50},
+                "user": {},
+            }
+            with open(nbcli_file, "w") as fp:
+                yaml.dump(nbcli_config, fp, default_flow_style=False)
+
+        subprocess.call(f"/usr/local/bin/nbcli {type_console} {arguments}", shell=True)

osism/commands/reconciler.py

@@ -47,7 +47,7 @@ class Sync(Command):
         t = reconciler.run.delay(publish=wait)
         if wait:
             logger.info(
-                f"Task {t.task_id} is running in background. Output coming soon."
+                f"Task {t.task_id} (sync inventory) is running in background. Output coming soon."
             )
             rc = 0
             stoptime = time.time() + task_timeout
@@ -77,4 +77,6 @@ class Sync(Command):
                             redis.close()
                             return rc
         else:
-            logger.info(f"Task {t.task_id} is running in background. No more output.")
+            logger.info(
+                f"Task {t.task_id} (sync inventory) is running in background. No more output."
+            )

osism/commands/validate.py

@@ -52,7 +52,7 @@ class Run(Command):
         )
         return parser
 
-    def _handle_task(self, t, wait, format, timeout):
+    def _handle_task(self, t, wait, format, timeout, playbook):
         rc = 0
         if wait:
             stoptime = time.time() + timeout
@@ -85,7 +85,7 @@ class Run(Command):
         else:
             if format == "log":
                 logger.info(
-                    f"Task {t.task_id} is running in background. No more output. Check ARA for logs."
+                    f"Task {t.task_id} (validate {playbook}) is running in background. No more output. Check ARA for logs."
                 )
             elif format == "script":
                 print(f"{t.task_id}")
@@ -120,6 +120,6 @@ class Run(Command):
             environment = VALIDATE_PLAYBOOKS[validator]["environment"]
             t = ansible.run.delay(environment, playbook, arguments)
 
-        rc = self._handle_task(t, wait, format, timeout)
+        rc = self._handle_task(t, wait, format, timeout, playbook)
 
         return rc

osism/settings.py

@@ -23,7 +23,7 @@ REDIS_PORT: int = int(os.getenv("REDIS_PORT", "6379"))
 REDIS_DB: int = int(os.getenv("REDIS_DB", "0"))
 
 
-NETBOX_URL = os.getenv("NETBOX_API")
+NETBOX_URL = os.getenv("NETBOX_API", os.getenv("NETBOX_URL"))
 NETBOX_TOKEN = os.getenv("NETBOX_TOKEN", read_secret("NETBOX_TOKEN"))
 IGNORE_SSL_ERRORS = os.getenv("IGNORE_SSL_ERRORS", "True") == "True"
 
@@ -35,8 +35,8 @@ INVENTORY_RECONCILER_SCHEDULE = float(
 
 OSISM_API_URL = os.getenv("OSISM_API_URL", None)
 
-OSISM_CONDUCTOR_NETBOX_FILTER_LIST = os.getenv(
-    "OSISM_CONDUCTOR_NETBOX_FILTER_LIST",
+NETBOX_FILTER_LIST = os.getenv(
+    "NETBOX_FILTER_LIST",
     "[{'state': 'active', 'tag': ['managed-by-ironic']}]",
 )
 

osism/tasks/conductor.py

@@ -1,5 +1,7 @@
 # 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
@@ -18,83 +20,9 @@ app.config_from_object(Config)
 
 
 configuration = {}
-nb_device_query_list = None
 
 
-@worker_process_init.connect
-def celery_init_worker(**kwargs):
-    global 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"
-            )
-            configuration = {}
-            return
-
-        # Resolve all IDs in the conductor.yml
-        if Config.enable_ironic.lower() in ["true", "yes"]:
-            if "ironic_parameters" not in configuration:
-                logger.error(
-                    "ironic_parameters not found in the conductor configuration"
-                )
-                return
-
-            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
-
-    global nb_device_query_list
-
+def get_nb_device_query_list():
     try:
         supported_nb_device_filters = [
             "site",
@@ -105,9 +33,7 @@ def celery_init_worker(**kwargs):
             "tag",
             "state",
         ]
-        nb_device_query_list = yaml.safe_load(
-            settings.OSISM_CONDUCTOR_NETBOX_FILTER_LIST
-        )
+        nb_device_query_list = yaml.safe_load(settings.NETBOX_FILTER_LIST)
         if type(nb_device_query_list) is not list:
             raise TypeError
         for nb_device_query in nb_device_query_list:
@@ -129,13 +55,81 @@ def celery_init_worker(**kwargs):
                         raise ValueError(f"Invalid name {value_name} for {key}")
     except (yaml.YAMLError, TypeError):
         logger.error(
-            f"Setting OSISM_CONDUCTOR_NETBOX_FILTER_LIST needs to be an array of mappings containing supported netbox device filters: {supported_nb_device_filters}"
+            f"Setting NETBOX_FILTER_LIST 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 OSISM_CONDUCTOR_NETBOX_FILTER_LIST: {exc}")
+        logger.error(f"Unknown value in NETBOX_FILTER_LIST: {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):
@@ -168,6 +162,31 @@ def sync_netbox_with_ironic(self, force_update=False):
                 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",
@@ -181,6 +200,7 @@ def sync_netbox_with_ironic(self, force_update=False):
     }
 
     devices = set()
+    nb_device_query_list = get_nb_device_query_list()
     for nb_device_query in nb_device_query_list:
         devices |= set(netbox.get_devices(**nb_device_query))
 
@@ -198,11 +218,6 @@ def sync_netbox_with_ironic(self, force_update=False):
                 logger.info(
                     f"Cleaning up baremetal node not found in netbox: {node['Name']}"
                 )
-                flavor_name = "osism-" + node["Name"]
-                flavor = openstack.compute_flavor_get(flavor_name)
-                if flavor:
-                    logger.info(f"Deleting flavor {flavor_name}")
-                    openstack.compute_flavor_delete(flavor)
                 for port in openstack.baremetal_port_list(
                     details=False, attributes=dict(node_uuid=node["UUID"])
                 ):
@@ -216,20 +231,51 @@ def sync_netbox_with_ironic(self, force_update=False):
     # NOTE: Find nodes in netbox which are not present in Ironic and add them
     for device in devices:
         logger.info(f"Looking for {device.name} in ironic")
+        logger.info(device)
 
         node_interfaces = list(netbox.get_interfaces_by_device(device.name))
 
         node_attributes = get_ironic_parameters()
+        if (
+            "ironic_parameters" in device.custom_fields
+            and device.custom_fields["ironic_parameters"]
+        ):
+            # 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()
+        deep_decrypt(node_attributes, 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
+                unused_drivers = [
+                    driver
+                    for driver in driver_params.keys()
+                    if driver != node_attributes["driver"]
+                ]
+                for key in list(node_attributes["driver_info"].keys()):
+                    for driver in unused_drivers:
+                        if key.startswith(driver + "_"):
+                            node_attributes["driver_info"].pop(key, None)
+                # NOTE: Render driver address field
                 address_key = driver_params[node_attributes["driver"]]["address"]
                 if address_key in node_attributes["driver_info"]:
-                    if "oob_address" in device.custom_fields:
-                        node_mgmt_address = device.custom_fields["oob_address"]
-                    elif "address" in device.oob_ip:
+                    if device.oob_ip and "address" in device.oob_ip:
                         node_mgmt_address = device.oob_ip["address"]
                     else:
                         node_mgmt_addresses = [
@@ -253,44 +299,19 @@ def sync_netbox_with_ironic(self, force_update=False):
                                 )
                             )
                         )
-                    else:
-                        logger.error(f"Could not find out-of-band address for {device}")
-                        node_attributes["driver_info"].pop(address_key, None)
-                if (
-                    "port" in driver_params[node_attributes["driver"]]
-                    and "oob_port" in device.custom_fields
-                    and device.custom_fields["oob_port"]
-                ):
-                    port_key = driver_params[node_attributes["driver"]]["port"]
-                    node_attributes["driver_info"].update(
-                        {port_key: device.custom_fields["oob_port"]}
-                    )
         node_attributes.update({"resource_class": device.name})
         ports_attributes = [
             dict(address=interface.mac_address)
             for interface in node_interfaces
             if interface.enabled and not interface.mgmt_only and interface.mac_address
         ]
-        flavor_attributes = {
-            "ram": 1,
-            "disk": 0,
-            "vcpus": 1,
-            "is_public": False,
-            "extra_specs": {
-                "resources:CUSTOM_"
-                + device.name.upper().replace("-", "_").replace(".", "_"): "1",
-                "resources:VCPU": "0",
-                "resources:MEMORY_MB": "0",
-                "resources:DISK_GB": "0",
-            },
-        }
 
         lock = Redlock(
             key=f"lock_osism_tasks_conductor_sync_netbox_with_ironic-{device.name}",
             masters={utils.redis},
-            auto_release_time=60,
+            auto_release_time=600,
         )
-        if lock.acquire(timeout=20):
+        if lock.acquire(timeout=120):
             try:
                 logger.info(f"Processing device {device.name}")
                 node = openstack.baremetal_node_show(device.name, ignore_missing=True)
@@ -413,48 +434,6 @@ def sync_netbox_with_ironic(self, force_update=False):
                     logger.info(
                         f"Validation of management interface failed for baremetal node for {device.name}\nReason: {node_validation['management'].reason}"
                     )
-
-                flavor_name = "osism-" + device.name
-                flavor = openstack.compute_flavor_get(flavor_name)
-                if not flavor:
-                    logger.info(f"Creating flavor for {flavor_name}")
-                    flavor = openstack.compute_flavor_create(
-                        flavor_name, flavor_attributes
-                    )
-                else:
-                    flavor_updates = {}
-                    deep_compare(flavor_attributes, flavor, flavor_updates)
-                    flavor_updates_extra_specs = flavor_updates.pop("extra_specs", None)
-                    if flavor_updates:
-                        logger.info(
-                            f"Updating flavor for {device.name} with {flavor_updates}"
-                        )
-                        openstack.compute_flavor_delete(flavor)
-                        flavor = openstack.compute_flavor_create(
-                            flavor_name, flavor_attributes
-                        )
-                    elif flavor_updates_extra_specs:
-                        logger.info(
-                            f"Updating flavor extra_specs for {device.name} with {flavor_updates_extra_specs}"
-                        )
-                        openstack.compute_flavor_update_extra_specs(
-                            flavor, flavor_updates_extra_specs
-                        )
-                        flavor = openstack.compute_flavor_get(flavor_name)
-                    for extra_specs_key in flavor["extra_specs"].keys():
-                        if (
-                            extra_specs_key
-                            not in flavor_attributes["extra_specs"].keys()
-                        ):
-                            logger.info(
-                                f"Deleting flavor extra_specs property {extra_specs_key} for {device.name}"
-                            )
-                            flavor = (
-                                openstack.compute_flavor_delete_extra_specs_property(
-                                    flavor, extra_specs_key
-                                )
-                            )
-
             except Exception as exc:
                 logger.info(
                     f"Could not fully synchronize device {device.name} with ironic: {exc}"

osism/tasks/openstack.py

@@ -136,47 +136,6 @@ def baremetal_port_delete(self, port_or_id):
     return result
 
 
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_get")
-def compute_flavor_get(self, name_or_id):
-    conn = utils.get_openstack_connection()
-    result = conn.compute.find_flavor(
-        name_or_id, ignore_missing=True, get_extra_specs=True
-    )
-    return result
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_create")
-def compute_flavor_create(self, name, attributes=None):
-    if attributes is None:
-        attributes = {}
-    attributes.update({"name": name})
-    extra_specs = attributes.pop("extra_specs", None)
-    conn = utils.get_openstack_connection()
-    flavor = conn.compute.create_flavor(**attributes)
-    if extra_specs:
-        flavor = conn.compute.create_flavor_extra_specs(flavor, extra_specs)
-    return flavor
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_delete")
-def compute_flavor_delete(self, flavor):
-    conn = utils.get_openstack_connection()
-    conn.compute.delete_flavor(flavor, ignore_missing=True)
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_update_extra_specs")
-def compute_flavor_update_extra_specs(self, flavor, extra_specs={}):
-    conn = utils.get_openstack_connection()
-    for key, value in extra_specs.items():
-        conn.compute.update_flavor_extra_specs_property(flavor, key, value)
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_delete_extra_specs")
-def compute_flavor_delete_extra_specs_property(self, flavor, prop):
-    conn = utils.get_openstack_connection()
-    conn.compute.delete_flavor_extra_specs_property(flavor, prop)
-
-
 @app.task(bind=True, name="osism.tasks.openstack.image_manager")
 def image_manager(
     self,

osism/tasks/reconciler.py

@@ -63,33 +63,3 @@ def run_on_change(self):
         p.wait()
 
         lock.release()
-
-
-@app.task(bind=True, name="osism.tasks.reconciler.sync_inventory_with_netbox")
-def sync_inventory_with_netbox(self):
-    lock = Redlock(
-        key="lock_osism_tasks_reconciler_sync_inventory_with_netbox",
-        masters={utils.redis},
-        auto_release_time=60,
-    )
-
-    if lock.acquire(timeout=20):
-        p = subprocess.Popen(
-            "/sync-inventory-with-netbox.sh",
-            shell=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-        )
-
-        for line in io.TextIOWrapper(p.stdout, encoding="utf-8"):
-            # NOTE: use task_id or request_id in future
-            utils.redis.publish(
-                "netbox-sync-inventory-with-netbox", {"type": "stdout", "content": line}
-            )
-
-        lock.release()
-
-    # NOTE: use task_id or request_id in future
-    utils.redis.publish(
-        "netbox-sync-inventory-with-netbox", {"type": "action", "content": "quit"}
-    )

osism/utils/__init__.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
+from cryptography.fernet import Fernet
 import keystoneauth1
 from loguru import logger
 import openstack
@@ -95,6 +96,22 @@ def get_openstack_connection():
     return conn
 
 
+def get_ansible_vault_password():
+    keyfile = "/share/ansible_vault_password.key"
+
+    try:
+        with open(keyfile, "r") as fp:
+            key = fp.read()
+        f = Fernet(key)
+
+        encrypted_ansible_vault_password = redis.get("ansible_vault_password")
+        ansible_vault_password = f.decrypt(encrypted_ansible_vault_password)
+        return ansible_vault_password.decode("utf-8")
+    except Exception as exc:
+        logger.error("Unable to get ansible vault password")
+        raise exc
+
+
 # https://stackoverflow.com/questions/2361426/get-the-first-item-from-an-iterable-that-matches-a-condition
 def first(iterable, condition=lambda x: True):
     """

{osism-0.20250425.0.dist-info → osism-0.20250514.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250425.0
+Version: 0.20250514.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -27,22 +27,21 @@ Requires-Dist: GitPython==3.1.44
 Requires-Dist: Jinja2==3.1.6
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: ara==1.7.2
-Requires-Dist: celery[redis]==5.5.1
+Requires-Dist: celery[redis]==5.5.2
 Requires-Dist: cliff==4.9.1
-Requires-Dist: deepdiff==8.4.2
+Requires-Dist: deepdiff==8.5.0
 Requires-Dist: docker==7.1.0
 Requires-Dist: dtrack-auditor==1.5.0
 Requires-Dist: fastapi==0.115.12
 Requires-Dist: flower==2.0.1
-Requires-Dist: hiredis==3.1.0
-Requires-Dist: jc==1.25.4
+Requires-Dist: hiredis==3.1.1
+Requires-Dist: jc==1.25.5
 Requires-Dist: keystoneauth1==5.10.0
 Requires-Dist: kombu==5.5.3
 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: nornir-ansible==2023.12.28
-Requires-Dist: nornir==3.5.0
 Requires-Dist: openstacksdk==4.5.0
 Requires-Dist: pottery==3.0.1
 Requires-Dist: prompt-toolkit==3.0.51
@@ -50,7 +49,7 @@ Requires-Dist: pydantic==1.10.22
 Requires-Dist: pynetbox==7.4.1
 Requires-Dist: pytest-testinfra==10.2.2
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: setuptools==79.0.1
+Requires-Dist: setuptools==80.4.0
 Requires-Dist: sqlmodel==0.0.24
 Requires-Dist: sushy==5.5.0
 Requires-Dist: tabulate==0.9.0
@@ -61,7 +60,7 @@ Provides-Extra: ansible
 Requires-Dist: ansible-runner==2.4.1; extra == "ansible"
 Requires-Dist: ansible-core==2.18.5; extra == "ansible"
 Provides-Extra: openstack-image-manager
-Requires-Dist: openstack-image-manager==0.20250423.0; extra == "openstack-image-manager"
+Requires-Dist: openstack-image-manager==0.20250508.0; extra == "openstack-image-manager"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{osism-0.20250425.0.dist-info → osism-0.20250514.0.dist-info}/RECORD

@@ -1,29 +1,29 @@
 osism/__init__.py,sha256=1UiNTBus0V0f2AbZQzAtVtu6zkfCCrw0OTq--NwFAqY,341
 osism/__main__.py,sha256=ILe4gu61xEISiBsxanqTQIdSkV-YhpZXTRlguCYyssk,141
-osism/api.py,sha256=xJC6RyC1TU54PU2C06rlialh2SmTCgM1L0MSgyUlubU,4331
+osism/api.py,sha256=_d7KvjvTK3PA-ZcAJKD7kXiSZrEQ8YV8NF7MYYriW3U,4327
 osism/main.py,sha256=Dt2-9sLXcS-Ny4DAz7hrha-KRc7zd7BFUTRdfs_X8z4,893
-osism/settings.py,sha256=xzFRbf5mdl_MUAUFqPavE14vaVuTr5z6b969vJQvF2E,1306
+osism/settings.py,sha256=09nVwFNWrx2LY-kw8kDG_gMEG72o49BvU8eqoqgQvuc,1299
 osism/actions/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
 osism/commands/__init__.py,sha256=Ag4wX_DCgXRdoLn6t069jqb3DdRylsX2nyYkiyCx4uk,456
-osism/commands/apply.py,sha256=n3lLb1cS3GahQqRT0723di98hg47MjVzDzkAoeZX7qU,16780
+osism/commands/apply.py,sha256=mH3-NctgevVzP_1IW92FQeiYMCPB49K5hXbxmTY2vnA,16795
 osism/commands/compose.py,sha256=iqzG7mS9E1VWaLNN6yQowjOqiHn3BMdj-yfXb3Dc4Ok,1200
 osism/commands/compute.py,sha256=XqOdnTqQ5Yqz__4rXbr64ctfe9Qq342IVFLnKmvjVpI,17226
-osism/commands/configuration.py,sha256=bvwBuc27glcZ5xDXQkKrgMDoXEdYgJnyjKd8fRj6hHk,890
+osism/commands/configuration.py,sha256=sPe8b0dVKFRbr30xoeVdAnHbGwCwgUh0xa_Vzv5pSQQ,954
 osism/commands/console.py,sha256=8BPz1hio5Wi6kONVAWFuSqkDRrMcLEYeFIY8dbtN6e4,3218
 osism/commands/container.py,sha256=Fku2GaCM3Idq_FxExUtNqjrEM0XYjpVvXmueSVO8S_c,1601
 osism/commands/get.py,sha256=ryytjtXWmlMV0NucP5tGkMZu0nIlC4xVtjRk4iMZ06c,8967
 osism/commands/log.py,sha256=2IpYuosC7FZwwLvM8HmKSU1NRNIelVVYzqjjVMCrOJk,4072
-osism/commands/manage.py,sha256=5ypZzA91QGgWCt35rVNJSXVC9l189IntS4UnsD8LRZY,11971
-osism/commands/netbox.py,sha256=_2-j6XM9JvH0DXnbct6rG9T6hT8KEpm3vazQC28Rt7I,4529
+osism/commands/manage.py,sha256=WxUZEhylZj2IhydAe3BAr3S5ED6opG243skfSq5q41s,11971
+osism/commands/netbox.py,sha256=XDJVuoh2pk7XKGAElnxIkJ_v8bZ2glk0FYynVzNnSPE,6059
 osism/commands/noset.py,sha256=7zDFuFMyNpo7DUOKcNiYV8nodtdMOYFp5LDPcuJhlZ8,1481
-osism/commands/reconciler.py,sha256=Ja_b86gX6-_Pr3DmrUUvskmEnnJpHQ-XJNQLycMJeyc,2818
+osism/commands/reconciler.py,sha256=xOyPzQj66xwjdQd2ysCTHX2yBvmMVMppUDZTas6voXc,2882
 osism/commands/server.py,sha256=avmoOv5rjOi-fN2A-27cPwOtiy2Q2j6UFtCh3QrfWAI,7512
 osism/commands/service.py,sha256=A1lgAlGeCJpbFFqF55DRWPcCirIgpU0dzjzVLZ0mz3k,2649
 osism/commands/set.py,sha256=xLBi2DzbVQo2jb3-cOIE9In5UB3vFxquQJkDN-EsfhM,1425
 osism/commands/status.py,sha256=X-Rcj-XuNPDBoxsGkf96NswwpmTognxz1V6E2NX2ZgY,1997
 osism/commands/sync.py,sha256=Vf9k7uVQTIu-8kK1u7Gjs3et3RRBEkmnNikot_PFJIE,484
 osism/commands/task.py,sha256=mwJJ7a71Lw3o_FX7j3rR0-NbPdPwMDOjbOAiiXE4uGc,543
-osism/commands/validate.py,sha256=hIQB0zk4xIBZJORtBp_tWrXTRKKhB2qi6j-mznDxKR4,4191
+osism/commands/validate.py,sha256=cA0CSvcbTr0K_6C5EofULrJSEp5xthpRC0TZgb_eazU,4233
 osism/commands/vault.py,sha256=Ip0IMR7zaBkPbLJenXr4ZwxM6FnozZ9wn9rwHmFHo8s,1818
 osism/commands/volume.py,sha256=l6oAk__dFM8KKdLTWOvuSiI7tLh9wAPZp8hwmYF-NX0,6595
 osism/commands/wait.py,sha256=mKFDqEXcaLlKw1T3MuBEZpNh7CeL3lpUXgubD2_f8es,6580
@@ -38,18 +38,18 @@ osism/services/listener.py,sha256=eEamlQsJqCuU9K2QFmk3yM9LAJZEanVcTLtGMsNCKjs,97
 osism/tasks/__init__.py,sha256=ZEu_KYsapTYp0etr-rLqie_NT_LndHDDpx53xITru5Y,8691
 osism/tasks/ansible.py,sha256=RcLxLrjzL5_X6OjNHm3H0lZlmKKlYKIANB0M4_d4chE,1109
 osism/tasks/ceph.py,sha256=eIQkah3Kj4INtOkF9kTjHbXJ3_J2lg48EWJKfHc-UYw,615
-osism/tasks/conductor.py,sha256=JlfSMgwwiXVjVk6HGwAtoJCyZO_qbY_O4tLtz7ibHKg,21039
+osism/tasks/conductor.py,sha256=Rxx8LrHVMksVpywpzi-av8Nj8qiBTmOFG9P_ksUe6SE,19477
 osism/tasks/kolla.py,sha256=wJQpWn_01iWLkr7l7T7RNrQGfRgsgmYi4WQlTmNGvew,618
 osism/tasks/kubernetes.py,sha256=VzXq_VrYU_CLm4cOruqnE3Kq2ydfO9glZ3p0bp3OYoc,625
 osism/tasks/netbox.py,sha256=QVOLiTH2Su237YAS0QfXbQ86E-OA1JzrFDfyi9JBmvk,5658
-osism/tasks/openstack.py,sha256=J0dvJYUWT1182LArm8UXplVpK5bNWSAdiHYR7urh2GM,7941
-osism/tasks/reconciler.py,sha256=RGUcax2gDuyVLw1nGRQn5izXclnPBo9MRl0ndLDiiYQ,2707
-osism/utils/__init__.py,sha256=_uhe9ghqAJ2me0p187X-vzJ2Nh_Hpmfw3D6HU4kKa10,3759
-osism-0.20250425.0.dist-info/licenses/AUTHORS,sha256=DJIRsjyrFxKjFvmpUNDRDBS04nRiJ5B6FpKcDcfnoGM,36
-osism-0.20250425.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-osism-0.20250425.0.dist-info/METADATA,sha256=rofd2A8V3RZhLVaC0Y7qmKQuWCmjNSjickRtZIg5U-g,2972
-osism-0.20250425.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-osism-0.20250425.0.dist-info/entry_points.txt,sha256=DlfrvU14rI55WuTrwNRoce9FY3ric4HeZKZx_Z3NzCw,3015
-osism-0.20250425.0.dist-info/pbr.json,sha256=qcrfoQrh4nhmive5GikkS5SflAbt999idvJgP56J1JY,47
-osism-0.20250425.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
-osism-0.20250425.0.dist-info/RECORD,,
+osism/tasks/openstack.py,sha256=g15tCll5vP1pC6ysxRCTZxplsdGmXbxaCH3k1Qdv5Xg,6367
+osism/tasks/reconciler.py,sha256=b6IRJBYvG_lRlQ6cQ46jSZJPNJeTI7igaCJ_7AzgIDQ,1767
+osism/utils/__init__.py,sha256=_Y4qchR5yyI_JKhBWd_jcsvDLYZjxO0c3iMA_VRQl58,4304
+osism-0.20250514.0.dist-info/licenses/AUTHORS,sha256=oWotd63qsnNR945QLJP9mEXaXNtCMaesfo8ZNuLjwpU,39
+osism-0.20250514.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+osism-0.20250514.0.dist-info/METADATA,sha256=xH8NKJUuInnfv4yHUIA00DMY_SGxYjaqXvDt4_OW-Jo,2935
+osism-0.20250514.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+osism-0.20250514.0.dist-info/entry_points.txt,sha256=IEmaQFJyKGN4mtNTLf9ogw7RXjEma4mSOUy_CEC4wzA,2975
+osism-0.20250514.0.dist-info/pbr.json,sha256=PlM5t0PTJqXXvUbF4gDXHHJ-HyaeT0oUE17z93Yqg7A,47
+osism-0.20250514.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
+osism-0.20250514.0.dist-info/RECORD,,

{osism-0.20250425.0.dist-info → osism-0.20250514.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{osism-0.20250425.0.dist-info → osism-0.20250514.0.dist-info}/entry_points.txt

@@ -21,6 +21,7 @@ get states = osism.commands.get:States
 get status = osism.commands.status:Run
 get tasks = osism.commands.get:Tasks
 get versions manager = osism.commands.get:VersionsManager
+get versions netbox = osism.commands.netbox:Versions
 log ansible = osism.commands.log:Ansible
 log container = osism.commands.log:Container
 log file = osism.commands.log:File
@@ -40,9 +41,7 @@ manage netbox = osism.commands.netbox:Manage
 manage server list = osism.commands.server:ServerList
 manage server migrate = osism.commands.server:ServerMigrate
 manage volume list = osism.commands.volume:VolumeList
-netbox ping = osism.commands.netbox:Ping
-netbox sync = osism.commands.netbox:Sync
-netbox sync ironic = osism.commands.netbox:Ironic
+netbox = osism.commands.netbox:Console
 noset bootstrap = osism.commands.noset:NoBootstrap
 noset maintenance = osism.commands.noset:NoMaintenance
 noset vault password = osism.commands.vault:UnsetPassword

osism-0.20250514.0.dist-info/licenses/AUTHORS

@@ -0,0 +1 @@
+Christian Berendt <berendt@osism.tech>

osism-0.20250514.0.dist-info/pbr.json

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

osism-0.20250425.0.dist-info/licenses/AUTHORS

@@ -1 +0,0 @@
-janhorstmann <horstmann@osism.tech>

osism-0.20250425.0.dist-info/pbr.json

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