summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-09-06 13:32:47 -0400
committerTim Rozet <trozet@redhat.com>2017-09-19 20:24:55 +0000
commitda94c0191c910a1c2c796abfbe6b380fc341ef84 (patch)
tree37237679085199689748a2de0c779c64858c9ca4
parente66df857ac68c728a05d6305d60142e8ed7d223e (diff)
Set aarch64 deploys to UEFI
Change-Id: I6b037ccd38fa68e5f863566a1c9a3ed4399bab84 Signed-off-by: Dan Radez <dradez@redhat.com>
-rw-r--r--apex/inventory/inventory.py5
-rw-r--r--apex/overcloud/overcloud_deploy.py4
2 files changed, 6 insertions, 3 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'
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index d37d73ca..f7a8b954 100644
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -122,9 +122,9 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir,
num_control = 0
num_compute = 0
for node in nodes:
- if node['capabilities'] == 'profile:control':
+ if 'profile:control' in node['capabilities']:
num_control += 1
- elif node['capabilities'] == 'profile:compute':
+ elif 'profile:compute' in node['capabilities']:
num_compute += 1
else:
# TODO(trozet) do we want to allow capabilities to not exist?