summaryrefslogtreecommitdiffstats
path: root/apex/inventory
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-21 00:03:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-21 00:03:11 +0000
commitd76b7e53517116a4b5cbe10dbf69a1a82e9b9a41 (patch)
treedf8a2e484137200c0ada2bd55045d4eb5d83b59d /apex/inventory
parent946251720965cd5da9f6798d3ff931950524dd24 (diff)
parentda94c0191c910a1c2c796abfbe6b380fc341ef84 (diff)
Merge "Set aarch64 deploys to UEFI"
Diffstat (limited to 'apex/inventory')
-rw-r--r--apex/inventory/inventory.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/apex/inventory/inventory.py b/apex/inventory/inventory.py
index dd731a83..71f8e528 100644
--- a/apex/inventory/inventory.py
+++ b/apex/inventory/inventory.py
@@ -48,6 +48,10 @@ class Inventory(dict):
if 'cpus' in node:
node['cpu'] = node['cpus']
+ # aarch64 is always uefi
+ if 'arch' in node and node['arch'] == 'aarch64':
+ node['capabilities'] += ',boot_mode:uefi'
+
for i in ('ipmi_ip', 'ipmi_pass', 'ipmi_user', 'mac_address',
'disk_device'):
if i == 'disk_device' and 'disk_device' in node.keys():
@@ -69,7 +73,6 @@ class Inventory(dict):
'for non-HA baremetal deployment')
if virtual:
- self['arch'] = platform.machine()
self['host-ip'] = '192.168.122.1'
self['power_manager'] = \
'nova.virt.baremetal.virtual_power_driver.VirtualPowerManager'