Merge "Conditionalize VM console arg based on arch"

diff --combined apex/undercloud/undercloud.py
index 513c419,1cdadbc..7b7c35f
--- 1/apex/undercloud/undercloud.py
--- 2/apex/undercloud/undercloud.py
+++ b/apex/undercloud/undercloud.py
@@@ -58,11 -58,13 +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)
@@@ -216,7 -218,7 +218,7 @@@
              "enabled": ns_external['enabled']
          }
  
 -        # FIXME (trozet): for now hardcoding aarch64 to false
 -        config['aarch64'] = False
 +        # Check if this is an ARM deployment
 +        config['aarch64'] = platform.machine() == 'aarch64'
  
          return config