osism 0.20250331.0__tar.gz → 0.20250407.0__tar.gz

osism-0.20250407.0/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v0.20250407.0
+-------------
+
+* chore(deps): update dependency openstack-image-manager to v0.20250407.0 (#1271)

{osism-0.20250331.0 → osism-0.20250407.0}/Containerfile

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

{osism-0.20250331.0 → osism-0.20250407.0}/Dockerfile

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

{osism-0.20250331.0/osism.egg-info → osism-0.20250407.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250331.0
+Version: 0.20250407.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -26,7 +26,7 @@ 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.4.0
+Requires-Dist: celery[redis]==5.5.0
 Requires-Dist: cliff==4.9.1
 Requires-Dist: deepdiff==8.4.2
 Requires-Dist: docker==7.1.0
@@ -60,7 +60,7 @@ Provides-Extra: ansible
 Requires-Dist: ansible-runner==2.4.1; extra == "ansible"
 Requires-Dist: ansible-core==2.18.4; extra == "ansible"
 Provides-Extra: openstack-image-manager
-Requires-Dist: openstack-image-manager==0.20250314.0; extra == "openstack-image-manager"
+Requires-Dist: openstack-image-manager==0.20250407.0; extra == "openstack-image-manager"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{osism-0.20250331.0 → osism-0.20250407.0}/Pipfile

@@ -10,7 +10,7 @@ Jinja2 = "==3.1.6"
 PyYAML = "==6.0.2"
 ansible-runner = "==2.4.1"
 ara = "==1.7.2"
-celery = {version = "==5.4.0", extras = ["redis"]}
+celery = {version = "==5.5.0", extras = ["redis"]}
 cliff = "==4.9.1"
 deepdiff = "==8.4.2"
 docker = "==7.1.0"

{osism-0.20250331.0 → osism-0.20250407.0}/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "a555c650c015f3d1360c7f3efce49c7258588d7772da512995bef5c8da60a26f"
+            "sha256": "35c9c01c094735503a1f921d8635b84c0d0555c5a14233741739c2c78fe91a76"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -126,11 +126,11 @@
                 "redis"
             ],
             "hashes": [
-                "sha256:369631eb580cf8c51a82721ec538684994f8277637edde2dfc0dacd73ed97f64",
-                "sha256:504a19140e8d3029d5acad88330c541d4c3f64c789d85f94756762d8bca7e706"
+                "sha256:10d49f9926d16237310109b0e6e1e2f7a2133b84e684bb36534d7663e66919bb",
+                "sha256:f4170c6e5952281318448a899d9e9a15b9cbd007e002091766900dc8f71b9394"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==5.4.0"
+            "version": "==5.5.0"
         },
         "certifi": {
             "hashes": [

{osism-0.20250331.0 → osism-0.20250407.0}/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.29", "1.30", "1.31"]
+SUPPORTED_CLUSTERAPI_K8S_IMAGES = ["1.30", "1.31", "1.32"]
 
 
 class ImageClusterapi(Command):
@@ -51,7 +51,7 @@ class ImageClusterapi(Command):
         parser.add_argument(
             "--filter",
             type=str,
-            help="Filter the version to be managed (e.g. 1.31)",
+            help="Filter the version to be managed (e.g. 1.32)",
             default=None,
         )
         return parser

{osism-0.20250331.0 → osism-0.20250407.0}/osism/commands/netbox.py

@@ -3,29 +3,33 @@
 from cliff.command import Command
 from loguru import logger
 
-from osism.tasks import conductor, netbox, reconciler, openstack, handle_task
+from osism.tasks import conductor, netbox, reconciler, handle_task
 
 
 class Ironic(Command):
     def get_parser(self, prog_name):
         parser = super(Ironic, self).get_parser(prog_name)
+        parser.add_argument(
+            "--no-wait",
+            help="Do not wait until the sync has been completed",
+            action="store_true",
+        )
+        parser.add_argument(
+            "--force-update",
+            help="Force update of baremetal nodes (Used to update non-comparable items like passwords)",
+            action="store_true",
+        )
         return parser
 
     def take_action(self, parsed_args):
-        # Get Ironic parameters from the conductor
-        task = conductor.get_ironic_parameters.delay()
-        task.wait(timeout=None, interval=0.5)
-        ironic_parameters = task.get()
+        wait = not parsed_args.no_wait
 
-        # Add all unregistered systems from the Netbox in Ironic
-        netbox.get_devices_not_yet_registered_in_ironic.apply_async(
-            (), link=openstack.baremetal_create_nodes.s(ironic_parameters)
+        task = conductor.sync_netbox_with_ironic.delay(
+            force_update=parsed_args.force_update
         )
-
-        # Synchronize the current status in Ironic with the Netbox
-        # openstack.baremetal_node_list.apply_async((), link=netbox.synchronize_device_state.s())
-
-        # Remove systems from Ironic that are no longer present in the Netbox
+        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):
@@ -33,7 +37,6 @@ class Sync(Command):
         parser = super(Sync, self).get_parser(prog_name)
         parser.add_argument(
             "--no-wait",
-            default=False,
             help="Do not wait until the sync has been completed",
             action="store_true",
         )

{osism-0.20250331.0 → osism-0.20250407.0}/osism/core/enums.py

@@ -188,7 +188,7 @@ MAP_ROLE2ROLE = {
         [
             "common",
             [
-                ["loadbalancer", ["opensearch", "mariadb-ng"]],
+                ["loadbalancer", ["letsencrypt", "opensearch", "mariadb-ng"]],
                 ["openvswitch", ["ovn"]],
                 "memcached",
                 "redis",
@@ -199,6 +199,19 @@ MAP_ROLE2ROLE = {
     "collection-kubernetes": [
         ["kubernetes", ["kubeconfig", ["copy-kubeconfig"]]],
     ],
+    "collection-openstack-core": [
+        "horizon",
+        [
+            "keystone",
+            [
+                "glance",
+                "cinder",
+                ["neutron", ["octavia"]],
+                "designate",
+                ["placement", ["nova"]],
+            ],
+        ],
+    ],
     "collection-openstack": [
         "horizon",
         [

{osism-0.20250331.0 → osism-0.20250407.0}/osism/services/listener.py

@@ -11,8 +11,7 @@ from loguru import logger
 import json
 import requests
 
-from osism import utils
-from osism.tasks import netbox, openstack
+from osism.tasks import netbox
 from osism import settings
 
 EXCHANGE_NAME = "ironic"
@@ -40,16 +39,13 @@ class BaremetalEvents:
                     },
                     "maintenance_set": {"end": self.node_maintenance_set_end},
                     "provision_set": {
+                        "start": self.node_provision_set_start,
                         "end": self.node_provision_set_end,
                         "success": self.node_provision_set_success,
                     },
                     "delete": {"end": self.node_delete_end},
                     "create": {"end": self.node_create_end},
                 },
-                "port": {
-                    "create": {"end": self.port_create_end},
-                    "update": {"end": self.port_update_end},
-                },
             }
         }
 
@@ -78,7 +74,7 @@ class BaremetalEvents:
         logger.info(
             f"baremetal.node.power_set.end ## {name} ## {object_data['power_state']}"
         )
-        netbox.set_state.delay(name, object_data["power_state"], "power")
+        netbox.set_power_state.delay(name, object_data["power_state"])
 
     def node_power_state_corrected_success(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
@@ -86,7 +82,7 @@ class BaremetalEvents:
         logger.info(
             f"baremetal.node.power_state_corrected.success ## {name} ## {object_data['power_state']}"
         )
-        netbox.set_state.delay(name, object_data["power_state"], "power")
+        netbox.set_power_state.delay(name, object_data["power_state"])
 
     def node_maintenance_set_end(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
@@ -94,7 +90,7 @@ class BaremetalEvents:
         logger.info(
             f"baremetal.node.maintenance_set.end ## {name} ## {object_data['maintenance']}"
         )
-        netbox.set_maintenance.delay(name, object_data["maintenance"])
+        netbox.set_maintenance.delay(name, state=object_data["maintenance"])
 
     def node_provision_set_success(self, payload: dict[Any, Any]) -> None:
         # A provision status was successfully set, update it in the netbox
@@ -103,80 +99,37 @@ class BaremetalEvents:
         logger.info(
             f"baremetal.node.provision_set.success ## {name} ## {object_data['provision_state']}"
         )
-        netbox.set_state.delay(name, object_data["provision_state"], "provision")
+        netbox.set_provision_state.delay(name, object_data["provision_state"])
 
-    def node_provision_set_end(self, payload: dict[Any, Any]) -> None:
+    def node_provision_set_start(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
         name = object_data["name"]
         logger.info(
-            f"baremetal.node.provision_set.end ## {name} ## {object_data['provision_state']}"
-        )
-        netbox.set_state.delay(name, object_data["provision_state"], "provision")
-
-        if (
-            object_data["previous_provision_state"] == "inspect wait"
-            and object_data["event"] == "done"
-        ):
-            netbox.set_state.delay(name, "introspected", "introspection")
-            openstack.baremetal_set_node_provision_state.delay(name, "provide")
-
-    def port_create_end(self, payload: dict[Any, Any]) -> None:
-        object_data = self.get_object_data(payload)
-        name = object_data["name"]
-        logger.info(f"baremetal.port.create.end ## {object_data['uuid']}")
-
-        mac_address = object_data["address"]
-        interface_a = utils.nb.dcim.interfaces.get(mac_address=mac_address)
-        device_a = interface_a.device
-
-        task = openstack.baremetal_get_network_interface_name.delay(
-            device_a.name, mac_address
-        )
-        task.wait(timeout=None, interval=0.5)
-        network_interface_name = task.get()
-
-        netbox.update_network_interface_name.delay(
-            object_data["address"], network_interface_name
+            f"baremetal.node.provision_set.start ## {name} ## {object_data['provision_state']}"
         )
+        netbox.set_provision_state.delay(name, object_data["provision_state"])
 
-    def port_update_end(self, payload: dict[Any, Any]) -> None:
+    def node_provision_set_end(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
         name = object_data["name"]
-        logger.info(f"baremetal.port.update.end ## {object_data['uuid']}")
-
-        mac_address = object_data["address"]
-        interface_a = utils.nb.dcim.interfaces.get(mac_address=mac_address)
-        device_a = interface_a.device
-
-        task = openstack.baremetal_get_network_interface_name.delay(
-            device_a.name, mac_address
-        )
-        task.wait(timeout=None, interval=0.5)
-        network_interface_name = task.get()
-
-        netbox.update_network_interface_name.delay(
-            object_data["address"], network_interface_name
+        logger.info(
+            f"baremetal.node.provision_set.end ## {name} ## {object_data['provision_state']}"
         )
+        netbox.set_provision_state.delay(name, object_data["provision_state"])
 
     def node_delete_end(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
         name = object_data["name"]
         logger.info(f"baremetal.node.delete.end ## {name}")
-
-        netbox.set_state.delay(name, "unregistered", "ironic")
-        netbox.set_state.delay(name, None, "provision")
-        netbox.set_state.delay(name, None, "power")
-        netbox.set_state.delay(name, None, "introspection")
-        netbox.set_state.delay(name, None, "deployment")
-
-        # remove internal flavor
-        openstack.baremetal_delete_internal_flavor.delay(name)
+        netbox.set_provision_state.delay(name, None)
+        netbox.set_power_state.delay(name, None)
 
     def node_create_end(self, payload: dict[Any, Any]) -> None:
         object_data = self.get_object_data(payload)
         name = object_data["name"]
         logger.info(f"baremetal.node.create.end ## {name}")
-        netbox.set_state.delay(name, "registered", "ironic")
+        netbox.set_provision_state.delay(name, object_data["provision_state"])
+        netbox.set_power_state.delay(name, object_data["power_state"])
 
 
 class NotificationsDump(ConsumerMixin):
@@ -207,7 +160,17 @@ class NotificationsDump(ConsumerMixin):
 
     def on_message(self, body, message):
         data = json.loads(body["oslo.message"])
-        # logger.info(data)
+        logger.debug(
+            data["event_type"]
+            + ": "
+            + str(
+                {
+                    k: v
+                    for k, v in data["payload"]["ironic_object.data"].items()
+                    if k in ["provision_state", "power_state"]
+                }
+            )
+        )
 
         if self.osism_api_session:
             tries = 1
@@ -268,8 +231,6 @@ class NotificationsDump(ConsumerMixin):
             handler = self.baremetal_events.get_handler(data["event_type"])
             handler(data["payload"])
 
-        logger.info(self.baremetal_events.get_object_data(data["payload"]))
-
 
 def main():
     while True: