diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 19:37:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 12:01:02 +0000 |
| commit | 2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch) | |
| tree | aa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch | |
| parent | 85c96cb879081b3b13a6d53c50866637d09f9f42 (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/0003-Make-qemu-kvm-architecture-aware.patch')
| -rw-r--r-- | patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch b/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch index 01cbdf83..25ec082e 100644 --- a/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch +++ b/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch @@ -3,23 +3,20 @@ Date: Wed, 24 Feb 2016 20:07:06 +0100 Subject: [PATCH] Make qemu-kvm architecture aware --- - deployment/puppet/openstack/manifests/compute.pp | 9 +++++++-- + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -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 b2339bc..ca1b2c4 100644 ---- a/deployment/puppet/openstack/manifests/compute.pp -+++ b/deployment/puppet/openstack/manifests/compute.pp -@@ -169,10 +169,15 @@ class openstack::compute ( - before => Augeas['libvirt-conf'], - } - +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -169,7 +169,12 @@ class openstack_tasks::compute ( + # From legacy libvirt.pp + # Guard against some exotic distros with their `uname -m` + $arch = $::architecture ? { + /(arm64|aarch64)/ => 'aarch64', + default => 'x86_64', + } - # From legacy libvirt.pp exec { 'symlink-qemu-kvm': - command => '/bin/ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64', - creates => '/usr/bin/qemu-system-x86_64', |