diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 14:43:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-16 14:43:33 +0000 |
| commit | 153c1536dccbe46729a09183658f10baaf68453e (patch) | |
| tree | 0cc144d48c71aae8c010b5734d6ebe317450dc2f /patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | |
| parent | 8aba188795b5c2887447e964c35887c18387cbfa (diff) | |
| parent | 3e6daeff593935828b853a6c31a578c471221bba (diff) | |
Merge "Rebase: p/fuel-library: CirrOS direct kernel boot"
Diffstat (limited to 'patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch')
| -rw-r--r-- | patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | 19 |
1 files changed, 19 insertions, 0 deletions
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 016d1f12..37b10879 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/> |