summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-15 14:54:39 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-15 14:54:39 +0000
commit7d0226a8c358541ef72c500f207dbaf7c082b08f (patch)
treec902e37f05eaa927495d6d63b1736e37511cc721
parent93425787e875e716f860d6f2b468ba5f6cfb0550 (diff)
parentf05a668c8361e43430094a02d63a4e8d9c59b1a2 (diff)
Merge "Fix: f-l: usb_table borked rebase."
-rw-r--r--patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch4
1 files changed, 2 insertions, 2 deletions
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 (