::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Enea AB, Cavium and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Date: Wed, 24 Feb 2016 20:08:24 +0100
Subject: [PATCH] Make TestVM creation architecture aware

This depends on cirros-testvm package to contain both amd64 and arm64
images.
---
 deployment/puppet/openstack/manifests/img/cirros.pp       |  8 ++++++--
 .../osnailyfacter/manifests/generate_vms/vm_config.pp     | 11 +++++++++++
 deployment/puppet/osnailyfacter/templates/vm_libvirt.erb  | 15 ++++++++++++++-
 files/fuel-migrate/fuel-migrate                           |  5 ++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/deployment/puppet/openstack/manifests/img/cirros.pp b/deployment/puppet/openstack/manifests/img/cirros.pp
index 84e202e..cff06e0 100644
--- a/deployment/puppet/openstack/manifests/img/cirros.pp
+++ b/deployment/puppet/openstack/manifests/img/cirros.pp
@@ -9,6 +9,10 @@ class openstack::img::cirros (
   $img_name = 'cirros',
   $os_name = 'cirros',
 ) {
+  $arch = $::architecture ? {
+      /(arm64|aarch64)/ => 'aarch64',
+      default           => 'x86_64',
+  }

   package { 'cirros-testvm':
     ensure => "present"
@@ -17,14 +21,14 @@ class openstack::img::cirros (
 case $::osfamily {
   'RedHat': {
   exec { 'upload-img':
-    command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /opt/vm/cirros-x86_64-disk.img",
+    command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /opt/vm/cirros-${arch}-disk.img",
     unless => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index && (/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index | grep ${img_name})",

     }
   }
   'Debian': {
   exec { 'upload-img':
-    command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /usr/share/cirros-testvm/cirros-x86_64-disk.img",
+    command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /usr/share/cirros-testvm/cirros-${arch}-disk.img",
     unless => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index && (/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index | grep ${img_name})",

     }
diff --git a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp
index 70fef32..dfefcbe 100644
--- a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp
+++ b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp
@@ -4,6 +4,17 @@ define osnailyfacter::generate_vms::vm_config(
   $details,
   $template_dir = '/var/lib/nova',
 ) {
+  case $::architecture {
+    'arm64', 'aarch64': {
+      $machine_arch = 'aarch64'
+      $machine_type = 'virt-2.6'
+    }
+    default: {
+      $machine_arch = 'x86_64'
+      $machine_type = 'pc'
+    }
+  }
+
   file { "${template_dir}/template_${name}_vm.xml":
     owner   => 'root',
     group   => 'root',
diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
index ae2ba5b..64e716d 100644
--- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
+++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
@@ -3,14 +3,17 @@
   <memory unit='GiB'><%= @details['mem'] %></memory>
   <vcpu placement='static'><%= @details['cpu'] %></vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
     <boot dev='network'/>
     <boot dev='hd'/>
   </os>
   <features>
     <acpi/>
     <apic/>
     <pae/>
+  <% if $machine_arch == 'aarch64' %>
+    <gic version='host' />
+  <% end %>
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
@@ -57,7 +66,11 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
+<% if $machine_arch == 'aarch64' %>
+      <model type='vga' vram='9216' heads='1'/>
+<% else %>
       <model type='cirrus' vram='9216' heads='1'/>
+<% end %>
     </video>
     <memballoon model='virtio'>
     </memballoon>
diff --git a/files/fuel-migrate/fuel-migrate b/files/fuel-migrate/fuel-migrate
index a215e0a..7d5b6cd 100755
--- a/files/fuel-migrate/fuel-migrate
+++ b/files/fuel-migrate/fuel-migrate
@@ -176,6 +176,8 @@ create_vm(){
             exit 1
         fi
     fi
+    # figure out atchitecture of the destination
+    arch="$(virsh -c "${dkvm_uri}" nodeinfo | awk '/CPU model:/ { print $3}')"
     # create disk
     ssh "${dkvm_ip}" qemu-img create -f raw "${dkvm_folder}/${fvm_name}.img" "${fvm_disk_size}"
     # make template for virsh
@@ -185,13 +187,14 @@ create_vm(){
   <memory unit='MiB'>${fvm_ram}</memory>
   <vcpu >${fvm_cpu}</vcpu>
   <os>
-    <type arch='x86_64' >hvm</type>
+    <type arch='${arch}' >hvm</type>
     <boot dev='hd'/>
     <boot dev='network'/>
  </os>
   <features>
     <acpi/>
     <apic/>
+    ${arch/aarch64/<gic version='3'\/>}
   </features>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>