Code Review
/
apex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
4c14519
)
Merge "Conditionalize VM console arg based on arch"
author
Tim Rozet
<trozet@redhat.com>
Fri, 8 Sep 2017 04:36:43 +0000
(
04:36
+0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Fri, 8 Sep 2017 04:36:43 +0000
(
04:36
+0000)
apex/undercloud/undercloud.py
patch
|
blob
|
history
diff --git
a/apex/undercloud/undercloud.py
b/apex/undercloud/undercloud.py
index
513c419
..
7b7c35f
100644
(file)
--- 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)