Merge pull request #402 from rackerlabs/flavor-cpu-model

feat(schema): switch cpu_models to cpu_model

Author: cardoe

python/ironic-understack/ironic_understack/flavor_spec.py

@@ -34,7 +34,7 @@ def from_yaml(yaml_str: str) -> "FlavorSpec":
             model=data["model"],
             memory_gb=data["memory_gb"],
             cpu_cores=data["cpu_cores"],
-            cpu_model=data.get("cpu_model", data.get("cpu_models", [""]).pop()),
+            cpu_model=data["cpu_model"],
             drives=data["drives"],
             pci=data.get("pci", []),
         )

schema/flavor.schema.json

@@ -25,16 +25,6 @@
             "description": "Processor model",
             "type": "string"
         },
-        "cpu_models": {
-            "description": "Processor models",
-            "type": "array",
-            "items": {
-                "type": "string",
-                "description": "Processor model"
-            },
-            "minItems": 1,
-            "maxItems": 1
-        },
         "memory_gb": {
             "description": "Total memory in GB",
             "type": "number"
@@ -80,5 +70,5 @@
             }
         }
     },
-    "required": [ "name", "manufacturer", "model", "cpu_cores", "cpu_models", "memory_gb", "drives" ]
+    "required": [ "name", "manufacturer", "model", "cpu_cores", "cpu_model", "memory_gb", "drives" ]
 }