build: Rework patch mechanism for Fuel submodules
[armband.git] / patches / fuel-library / multiarch-fuel / 0001-Make-qemu-kvm-architecture-aware.patch
1 From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
2 Date: Wed, 24 Feb 2016 20:07:06 +0100
3 Subject: [PATCH] Make qemu-kvm architecture aware
4
5 ---
6  deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 9 +++++++--
7  1 file changed, 7 insertions(+), 2 deletions(-)
8
9 diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
10 index 3fcfb51..c53409c 100644
11 --- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
12 +++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
13 @@ -167,9 +167,14 @@ class openstack_tasks::roles::compute {
14    case $::osfamily {
15      'RedHat': {
16        # From legacy libvirt.pp
17 +      # Guard against some exotic distros with their `uname -m`
18 +      $arch = $::architecture ? {
19 +        /(arm64|aarch64)/ => 'aarch64',
20 +        default           => 'x86_64',
21 +      }
22        exec { 'symlink-qemu-kvm':
23 -        command => '/bin/ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64',
24 -        creates => '/usr/bin/qemu-system-x86_64',
25 +        command => "/bin/ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-system-${arch}",
26 +        creates => "/usr/bin/qemu-system-${arch}",
27        }
28
29        package { 'avahi':