Rework: Move m1.micro RAM bump to post-install.

[armband.git] / patches / fuel-library / 0003-Make-qemu-kvm-architecture-aware.patch

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 00cd3c7..25ec082 100644 (file)
--- 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
-index b2339bc..4f380b8 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'],
-       }
- 
+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_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',
++        /(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',
@@ -28,6 +25,3 @@ index b2339bc..4f380b8 100644
        }
  
        package { 'avahi':
--- 
-1.9.1
-