Support image name in CAPI openstackMachine

vexxhost · Sep 27, 2023 · 7af13ec · 7af13ec
1 parent 391cdac
commit 7af13ec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -23,6 +23,7 @@
 import pykube
 import yaml
 from magnum import objects as magnum_objects
+from magnum.api import attr_validator
 from magnum.common import context, neutron
 from magnum.common import utils as magnum_utils
 from magnum.common.cert_manager import cert_manager
@@ -1576,7 +1577,7 @@ def generate_machine_deployments_for_cluster(
                     },
                     {
                         "name": "imageUUID",
-                        "value": ng.image_id,
+                        "value": utils.get_image_uuid(ng.image_id, context),
                     },
                 ],
             },
@@ -1817,7 +1818,7 @@ def get_object(self) -> objects.Cluster:
                             },
                             {
                                 "name": "imageUUID",
-                                "value": self.cluster.default_ng_master.image_id,
+                                "value": utils.get_image_uuid(self.cluster.default_ng_master.image_id, self.context),
                             },
                             {
                                 "name": "nodeCidr",

diff --git a/magnum_cluster_api/utils.py b/magnum_cluster_api/utils.py
@@ -20,6 +20,7 @@
 import shortuuid
 import yaml
 from magnum import objects as magnum_objects
+from magnum.api import attr_validator
 from magnum.common import context, exception, octavia
 from magnum.common import utils as magnum_utils
 from oslo_serialization import base64
@@ -301,3 +302,14 @@ def validate_nodegroup(
     # Validate flavors
     osc = clients.get_openstack_api(ctx)
     validate_flavor_name(osc, nodegroup.flavor_id)
+
+
+def get_image_uuid(
+    image_ref: str, ctx: context.RequestContext
+):
+    """Get image uuid from image ref
+
+    :param image_ref: Image id or name
+    """
+    image_obj = attr_validator.validate_image(osc, self.cluster.default_ng_master.image_id)
+    return image_obj.get("id")