fix: allow for optional ssh key

vexxhost · Oct 25, 2022 · c2ed0af · c2ed0af
1 parent d90ba3c
commit c2ed0af
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -369,6 +369,19 @@ def get_object(self) -> pykube.Secret:
 
 class OpenStackMachineTemplate(NodeGroupBase):
     def get_object(self) -> objects.OpenStackMachineTemplate:
+        spec = {
+            "cloudName": "default",
+            "flavor": self.node_group.flavor_id,
+            "identityRef": {
+                "kind": pykube.Secret.kind,
+                "name": f"{name_from_cluster(self.cluster)}-cloud-config",
+            },
+            "imageUUID": self.node_group.image_id,
+        }
+
+        if self.cluster.keypair:
+            spec["sshKeyName"] = self.cluster.keypair
+
         return objects.OpenStackMachineTemplate(
             self.api,
             {
@@ -379,20 +392,7 @@ def get_object(self) -> objects.OpenStackMachineTemplate:
                     "namespace": "magnum-system",
                     "labels": self.labels,
                 },
-                "spec": {
-                    "template": {
-                        "spec": {
-                            "cloudName": "default",
-                            "flavor": self.node_group.flavor_id,
-                            "identityRef": {
-                                "kind": pykube.Secret.kind,
-                                "name": f"{name_from_cluster(self.cluster)}-cloud-config",
-                            },
-                            "imageUUID": self.node_group.image_id,
-                            "sshKeyName": self.cluster.keypair,
-                        }
-                    }
-                },
+                "spec": {"template": {"spec": spec}},
             },
         )