diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-21 00:03:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-21 00:03:11 +0000 |
| commit | d76b7e53517116a4b5cbe10dbf69a1a82e9b9a41 (patch) | |
| tree | df8a2e484137200c0ada2bd55045d4eb5d83b59d /apex | |
| parent | 946251720965cd5da9f6798d3ff931950524dd24 (diff) | |
| parent | da94c0191c910a1c2c796abfbe6b380fc341ef84 (diff) | |
Merge "Set aarch64 deploys to UEFI"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/inventory/inventory.py | 5 | ||||
| -rw-r--r-- | apex/overcloud/overcloud_deploy.py | 4 |
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? |