From fb356f4606884ec608116e2cc9f4d9ac1eeebdda Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 17 Jun 2016 19:36:51 +0200 Subject: Fix: f-l: upload_cirros glance cmd, syntar err. While at it split another patch in f-l in two. Change-Id: Ife31a94447176798c3cf7052408ffeddb1e753ff Signed-off-by: Alexandru Avadanii --- .../0005-Disable-usb-tablet-for-aarch64.patch | 14 +--------- ...oad_cirros-Add-direct-kernel-boot-support.patch | 27 ++++++++++--------- ...0007-Install-vgabios-and-link-for-aarch64.patch | 30 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 patches/fuel-library/0007-Install-vgabios-and-link-for-aarch64.patch (limited to 'patches') diff --git a/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch index fbdad7b5..1109656c 100644 --- a/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch +++ b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch @@ -1,6 +1,6 @@ From: Stanislaw Kardach Date: Tue, 15 Mar 2016 11:33:52 +0100 -Subject: [PATCH] Disable usb tablet for aarch64 +Subject: [PATCH] nova config: Disable usb tablet for aarch64 --- deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 12 ++++++++++++ @@ -18,15 +18,3 @@ index ca1b2c4..c0349dc 100644 + }; 'libvirt/live_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST'; 'libvirt/block_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC'; -@@ -364,3 +368,11 @@ class openstack::compute ( - libvirt_service_name => $::nova::params::libvirt_service_name, -+ } -> -+ package { 'vgabios': -+ ensure => present; -+ } -> -+ file { '/usr/share/qemu/vgabios-stdvga.bin': -+ ensure => link, -+ target => '/usr/share/vgabios/vgabios.bin', -+ replace => false, - } - diff --git a/patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch b/patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch index 056b1aef..a928761c 100644 --- a/patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch +++ b/patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch @@ -8,11 +8,11 @@ images (disk formats `AKI` and `ARI`). Signed-off-by: Stanislaw Kardach --- - .../osnailyfacter/modular/astute/upload_cirros.rb | 53 ++++++++++++++++++++-- - 1 file changed, 50 insertions(+), 3 deletions(-) + .../osnailyfacter/modular/astute/upload_cirros.rb | 52 +++++++++++++++++++++- + 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb -index f0441b0..cefc3ed 100755 +index f0441b0..a619f3f 100755 --- a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb +++ b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb @@ -56,7 +56,7 @@ def image_list @@ -30,7 +30,7 @@ index f0441b0..cefc3ed 100755 +# 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}" ++ command = "/usr/bin/openstack image set --property #{property}=#{value} #{image_id}" + puts command + stdout = `#{command}` + return_code = $?.exitstatus @@ -93,13 +93,12 @@ index f0441b0..cefc3ed 100755 ######################## wait_for_glance -@@ -167,7 +213,8 @@ test_vm_images.each do |image| - # retry upload 5 times with a 1 minute sleep between tries - 5.times.each do |retries| - if upload_image(image) -- success = true -+ if connect_dependant_images(test_vm_images) == 0 -+ success = true - break - end - sleep 60 +@@ -180,6 +226,8 @@ if errors > 0 + cleanup_image(image) + end + exit 1 ++elsif connect_dependant_images(test_vm_images) > 0 ++ exit 2 + end + + exit 0 diff --git a/patches/fuel-library/0007-Install-vgabios-and-link-for-aarch64.patch b/patches/fuel-library/0007-Install-vgabios-and-link-for-aarch64.patch new file mode 100644 index 00000000..04e2abf6 --- /dev/null +++ b/patches/fuel-library/0007-Install-vgabios-and-link-for-aarch64.patch @@ -0,0 +1,30 @@ +From: Alexandru Avadanii +Date: Tue, 15 Mar 2016 11:33:52 +0100 +Subject: [PATCH] Install vgabios (and link) for aarch64 + +vgabios is needed for standard VGA mode in AArch64 VMs, so +install it by default on AArch64 and create missing link +in to . + +Signed-off-by: Alexandru Avadanii +Signed-off-by: Stanislaw Kardach +--- + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +index ca1b2c4..c0349dc 100644 +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -364,3 +368,11 @@ class openstack::compute ( + libvirt_service_name => $::nova::params::libvirt_service_name, ++ } -> ++ package { 'vgabios': ++ ensure => present; ++ } -> ++ file { '/usr/share/qemu/vgabios-stdvga.bin': ++ ensure => link, ++ target => '/usr/share/vgabios/vgabios.bin', ++ replace => false, + } + -- cgit 1.2.3-korg