summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 19:37:20 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:01:02 +0000
commit2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch)
treeaa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
parent85c96cb879081b3b13a6d53c50866637d09f9f42 (diff)
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
Diffstat (limited to 'patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch')
-rw-r--r--patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch24
1 files changed, 9 insertions, 15 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 37b42341..bab44b53 100644
--- a/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
+++ b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
@@ -3,28 +3,23 @@ Date: Tue, 15 Mar 2016 11:33:52 +0100
Subject: [PATCH] Disable usb tablet for aarch64
---
- deployment/puppet/openstack/manifests/compute.pp | 12 ++++++++++++
+ deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 12 ++++++++++++
1 file changed, 12 insertions(+)
-diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
+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/manifests/compute.pp
-+++ b/deployment/puppet/openstack/manifests/compute.pp
-@@ -316,6 +316,10 @@ class openstack::compute (
+--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
+@@ -316,3 +316,7 @@ class openstack::compute (
nova_config {
- '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';
+ 'libvirt/use_usb_tablet': value => $::architecture ? {
+ /(arm64|aarch64)/ => false,
+ default => true,
+ }
- }
-
- nova_config {
-@@ -364,6 +368,14 @@ class openstack::compute (
- # Workaround for bug LP #1469308
- # also service name for Ubuntu and Centos is the same.
- libvirt_service_name => "libvirtd",
+ '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;
@@ -35,4 +30,3 @@ index ca1b2c4..c0349dc 100644
+ replace => false,
}
- # From legacy libvirt.pp