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 --- .../fuel-library/0005-Disable-usb-tablet-for-aarch64.patch | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch') 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, - } - -- cgit 1.2.3-korg