X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcm-plugins.git;a=blobdiff_plain;f=inventoryhandlers%2Fbaremetal-node-inventory%2Fzbaremetalnodeinventory.py;fp=inventoryhandlers%2Fbaremetal-node-inventory%2Fzbaremetalnodeinventory.py;h=9d038b245c46afb4b7a3d6d77b301f52ea82299c;hp=b6b90e9c80dc934270f7640b3e3e65bd86e2ab5e;hb=3deea1d586f92efdb13951574a9e03f7f31702d1;hpb=5c3f9f389f46f719579ac4cd4065490b1723ebff diff --git a/inventoryhandlers/baremetal-node-inventory/zbaremetalnodeinventory.py b/inventoryhandlers/baremetal-node-inventory/zbaremetalnodeinventory.py index b6b90e9..9d038b2 100644 --- a/inventoryhandlers/baremetal-node-inventory/zbaremetalnodeinventory.py +++ b/inventoryhandlers/baremetal-node-inventory/zbaremetalnodeinventory.py @@ -13,6 +13,7 @@ # limitations under the License. import json +import platform from jinja2 import Environment from cmframework.apis import cmansibleinventoryconfig @@ -152,7 +153,7 @@ class zbaremetalnodeinventory(cmansibleinventoryconfig.CMAnsibleInventoryConfigP properties = { "capabilities": "boot_option:local", - "cpu_arch": "x86_64", + "cpu_arch": platform.machine(), "cpus": 8, "disk_size": 40, "ram": 16384 @@ -163,6 +164,10 @@ class zbaremetalnodeinventory(cmansibleinventoryconfig.CMAnsibleInventoryConfigP "virtmedia_deploy_iso": "file:///opt/images/ironic-deploy.iso", } + # aarch64 platforms only support EFI bootloaders + if platform.machine() == 'aarch64': + properties["capabilities"] += ",boot_mode:uefi" + if utils.is_virtualized(): driver = "ssh_virtmedia" properties["root_device"] = {"by_path": host_hdd_mapping['os']}