diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-08 04:36:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-08 04:36:43 +0000 |
| commit | 2ecb25bea8dbb8abc7bd4f90f07101b40e70363b (patch) | |
| tree | 1bfc2eef36a72015b186c268c11944eb0d0511f0 | |
| parent | 4c14519e56d9b5a77743f6f2fbc92068d996a649 (diff) | |
| parent | 9fa20a64cab555031ddac4238e33ccb5369e676d (diff) | |
Merge "Conditionalize VM console arg based on arch"
| -rw-r--r-- | apex/undercloud/undercloud.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 513c4191..7b7c35f0 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -58,11 +58,13 @@ class Undercloud: networks = ['admin'] if self.external_net: networks.append('external') + console = 'ttyAMA0' if platform.machine() == 'aarch64' else 'ttyS0' + self.vm = vm_lib.create_vm(name='undercloud', image=self.volume, baremetal_interfaces=networks, direct_boot='overcloud-full', - kernel_args=['console=ttyS0', + kernel_args=['console={}'.format(console), 'root=/dev/sda'], default_network=True, template_dir=self.template_path) |