From 3e6daeff593935828b853a6c31a578c471221bba Mon Sep 17 00:00:00 2001
From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Date: Sun, 15 May 2016 18:35:25 -0700
Subject: Rebase: p/fuel-library: CirrOS direct kernel boot

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Change-Id: I12126a39c90abf8fc5bef449506e87dc190a50ee
---
 ...0004-Make-TestVM-creation-architecture-aware.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch')

diff --git a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
index b9a8ed10..869920e0 100644
--- a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
+++ b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
@@ -129,3 +129,22 @@ index fad9436..667d4a7 100755
    </features>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
+--- deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
++++ deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
+@@ -3,9 +3,15 @@
+   <memory unit='GiB'><%= @details['mem'] %></memory>
+   <vcpu placement='static'><%= @details['cpu'] %></vcpu>
+   <os>
+-    <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
++  <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
++  <% if  == 'aarch64' %>
++    <kernel>/var/lib/nova/<%= @details['id'] %>_vm.kernel</kernel>
++    <initrd>/var/lib/nova/<%= @details['id'] %>_vm.initramfs</initrd>
++    <cmdline>root=/dev/vda1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0</cmdline>
++  <% else %>
+     <boot dev='network'/>
+     <boot dev='hd'/>
++  <% end %>
+   </os>
+   <features>
+     <acpi/>
-- 
cgit 1.2.3-korg