diff options
author | Florin Dumitrascu <florin.dumitrascu@enea.com> | 2016-03-08 14:17:01 +0100 |
---|---|---|
committer | Florin Dumitrascu <florin.dumitrascu@enea.com> | 2016-03-22 19:03:21 +0100 |
commit | 80ba8c45cda5308010ded08b3d070343a92d58b5 (patch) | |
tree | faa6ffd8020d73cee7a1cc966dee5ab1af557163 /patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch | |
parent | 7bfc08a72654b440b52c609ca67199f13df2f668 (diff) |
Add fixes and improvements for arm64 deployment
[ Florin Dumitrascu <florin.dumitrascu@enea.com> ]
* arm64 support for OpenDaylight Fuel Plugin
[ Stanislaw Kardach <kda@semihalf.com> ]
* Limit ESP to first drive
* Remove default+timeout+tr from cobbler profile
* Fix puppet syntax errors
* Disable usb tablet on aarch64
* Support direct kernel boot for CirrOS TestVM on aarch64
* Remove git version signature not to confuse patches-export
* Fix VGA support for CirrOS TestVM
* Makefile: Add clean-{docker,build}.
[ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ]
* Performance: Use gzip instead of xz compression.
* Switch mirror proto from https to http.
* Update TODO with remaining tasks.
* Disable amd64 Liberty fixture (no multi-arch support yet).
* m1.micro: Increase RAM size to 128MB for aarch64 images.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
Diffstat (limited to 'patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch')
-rw-r--r-- | patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch | 138 |
1 files changed, 138 insertions, 0 deletions
diff --git a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch new file mode 100644 index 00000000..0c110430 --- /dev/null +++ b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch @@ -0,0 +1,138 @@ +From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Date: Tue, 15 Mar 2016 15:01:34 +0100 +Subject: [PATCH] direct kernel boot for cirros + +--- + .../osnailyfacter/modular/astute/upload_cirros.rb | 58 +++++++++++++++++++++- + .../puppet/osnailyfacter/templates/vm_libvirt.erb | 8 ++- + 2 files changed, 63 insertions(+), 3 deletions(-) + +diff --git a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb +index 04d597c..c342830 100755 +--- a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb ++++ b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb +@@ -1,6 +1,7 @@ + #!/usr/bin/env ruby + require 'hiera' + ++ + ENV['LANG'] = 'C' + + hiera = Hiera.new(:config => '/etc/hiera.yaml') +@@ -56,11 +57,17 @@ def image_list + fields = line.split('|').map { |f| f.chomp.strip } + next if fields[1] == 'ID' + next unless fields[2] +- images << fields[2] ++ images << [fields[1], fields[2]] + end + {:images => images, :exit_code => return_code} + end + ++def image_name_list ++ images = image_list ++ images[:images].map! { |i| i[1] } ++ images ++end ++ + # TODO degorenko: remove --os-image-api-version after liberty (fuel-8.0) release + def image_create(image_hash) + command = <<-EOF +@@ -79,6 +86,15 @@ EOF + [ stdout, return_code ] + end + ++# Calls glance update-image with a given property and value ++def update_image(image_id, property, value) ++ command = "/usr/bin/glance image-update --#{property} #{value} #{image_id}" ++ puts command ++ stdout = `#{command}` ++ return_code = $?.exitstatus ++ [ stdout, return_code ] ++end ++ + # check if Glance is online + # waited until the glance is started because when vCenter used as a glance + # backend launch may takes up to 1 minute. +@@ -93,7 +109,7 @@ end + # upload image to Glance + # if it have not been already uploaded + def upload_image(image) +- list_of_images = image_list ++ list_of_images = image_name_list + if list_of_images[:images].include?(image['img_name']) && list_of_images[:exit_code] == 0 + puts "Image '#{image['img_name']}' is already present!" + return 0 +@@ -109,6 +125,43 @@ def upload_image(image) + return return_code + end + ++# For each disk image try to find a kernel and initramfs images and ++# attach then to it via kernel_id and ramdisk_id glance properties. ++def connect_dependant_images(images) ++ # for each image ++ # get image id from glance ++ img_list = image_list ++ return_code = img_list[:exit_code] ++ if return_code == 0 ++ images.each do |image| ++ img_list[:images].each do |il| ++ if il[1] == image['img_name'] ++ image['id'] = il[0] ++ end ++ end ++ end ++ # for each image that is not in [aki, ari] ++ images.each do |image| ++ next if ['aki', 'ari'].include?(image['disk_format']) ++ images.each do |i| ++ # find aki/ari image whose name starts with this image's name ++ if i['img_name'].start_with?(image['img_name']) ++ ret = 0 ++ if i['disk_format'] == 'aki' ++ _, ret = update_image(image['id'], 'property', ++ "kernel_id=#{i['id']}") ++ elsif i['disk_format'] == 'ari' ++ _, ret = update_image(image['id'], 'property', ++ "ramdisk_id=#{i['id']}") ++ end ++ return_code += ret ++ end ++ end ++ end ++ end ++ return return_code ++end ++ + ######################## + + wait_for_glance +@@ -117,6 +170,7 @@ errors = 0 + test_vm_images.each do |image| + errors += upload_image(image) + end ++errors = connect_dependant_images(test_vm_images) unless errors != 0 + + exit 1 unless errors == 0 + +diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb +index 88b2c73..65e9400 100644 +--- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb ++++ b/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 $machine_arch == '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/> |