Merge "Backport git based patching from Fuel@OPNFV."

[armband.git] / 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 bab44b5..1109656 100644 (file)
--- 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 <stanislaw.kardach@caviumnetworks.com>
 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 ++++++++++++
@@ -12,21 +12,9 @@ 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 (
-     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,
-   }
-