From: Alexandru Avadanii Date: Wed, 15 Jun 2016 09:31:54 +0000 (+0200) Subject: Fix: f-l: usb_table borked rebase. X-Git-Tag: colorado.1.rc1~394^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f05a668c8361e43430094a02d63a4e8d9c59b1a2;p=armband.git Fix: f-l: usb_table borked rebase. I messed up the identation and missed a semicolon during rebase. Change-Id: I7142721cc57115a72c93bcfd270c03d6cb04c399 Signed-off-by: Alexandru Avadanii --- 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 bab44b53..fbdad7b5 100644 --- a/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch +++ b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch @@ -12,10 +12,10 @@ index ca1b2c4..c0349dc 100644 +++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp @@ -316,3 +316,7 @@ class openstack::compute ( nova_config { -+ 'libvirt/use_usb_tablet': value => $::architecture ? { ++ 'libvirt/use_usb_tablet': value => $::architecture ? { + /(arm64|aarch64)/ => false, + default => true, -+ } ++ }; '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 (