Conditionalize VM console arg based on arch 99/41199/4
authorDan Radez <dradez@redhat.com>
Wed, 6 Sep 2017 17:17:26 +0000 (13:17 -0400)
committerDan Radez <dradez@redhat.com>
Thu, 7 Sep 2017 03:20:26 +0000 (23:20 -0400)
Change-Id: Ide9159e5ba7d5388c7bf62bf865b0015422e9159
Signed-off-by: Dan Radez <dradez@redhat.com>
apex/undercloud/undercloud.py

index da695f5..1cdadbc 100644 (file)
@@ -10,6 +10,7 @@
 import libvirt
 import logging
 import os
+import platform
 import shutil
 import subprocess
 import time
@@ -57,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)