diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-16 19:49:23 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-16 19:49:23 +0000 |
commit | 9fbc51ccdd630c2ce023e9de7cc29afddf288fb9 (patch) | |
tree | c7f9c8d08c8d8ca9929aa71b737fcfbba90f6972 /patches | |
parent | 68ab03dc69c1f123956f7dc1ecc55b129617b3c6 (diff) | |
parent | 2f4a34b88d18f7653934eaec25e99dba3bac5de6 (diff) |
Merge "fuel-library: nova: AArch64: enable hugepage supp"
Diffstat (limited to 'patches')
-rw-r--r-- | patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch (renamed from patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch) | 2 | ||||
-rw-r--r-- | patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch | 93 |
2 files changed, 94 insertions, 1 deletions
diff --git a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch b/patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch index 199ef122..c289bd8d 100644 --- a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch +++ b/patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch @@ -1,6 +1,6 @@ From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> Date: Tue, 22 Mar 2016 12:05:09 +0100 -Subject: [PATCH] Update vga, console defaults for armv7 and aarch64 +Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64 Nova hardcodes default options for both video=cirrus and console. armv7 and aarch64 VMs require video=vga, and since most applications diff --git a/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch b/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch new file mode 100644 index 00000000..16e06ba8 --- /dev/null +++ b/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch @@ -0,0 +1,93 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Fri, 16 Sep 2016 21:31:56 +0200 +Subject: [PATCH] nova: AArch64: enable hugepage support + +This patch adds AArch64 to the hardcoded lists of valid +architectures for hugepage support. + +Closes-bug: ARMBAND-90 + +Signed-off-by: Veena Lingadahalli <vlingadahalli@mvista.com> +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../nova-AArch64-enable-hugepage-support.patch | 47 ++++++++++++++++++++++ + .../openstack_tasks/manifests/roles/compute.pp | 12 ++++++ + 2 files changed, 59 insertions(+) + create mode 100644 deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch + +diff --git a/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch b/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch +new file mode 100644 +index 0000000..847cab6 +--- /dev/null ++++ b/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch +@@ -0,0 +1,47 @@ ++From: Veena Lingadahalli <vlingadahalli@mvista.com> ++Date: Fri Sep 16 17:52:02 CEST 2016 ++Subject: [PATCH] nova: AArch64: enable hugepage support ++ ++This patch adds AArch64 to the hardcoded lists of valid ++architectures for hugepage support. ++ ++Signed-off-by: Veena Lingadahalli <vlingadahalli@mvista.com> ++Acked-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++--- ++ ++diff --git a/compute/arch.py a/compute/arch.py ++index 265f853..6a4b4a3 100644 ++--- a/compute/arch.py +++++ a/compute/arch.py ++@@ -156,6 +156,9 @@ def canonicalize(name): ++ if newname == "amd64": ++ newname = X86_64 ++ +++ if newname == "aarch64": +++ newname = AARCH64 +++ ++ if not is_valid(newname): ++ raise exception.InvalidArchitectureName(arch=name) ++ ++diff --git a/virt/libvirt/driver.py a/virt/libvirt/driver.py ++index bac17cf..0e0bcae 100644 ++--- a/virt/libvirt/driver.py +++++ a/virt/libvirt/driver.py ++@@ -5206,7 +5206,7 @@ class LibvirtDriver(driver.ComputeDriver): ++ self._bad_libvirt_numa_version_warn = True ++ return False ++ ++- support_matrix = {(arch.I686, arch.X86_64): MIN_LIBVIRT_NUMA_VERSION, +++ support_matrix = {(arch.I686, arch.X86_64, arch.AARCH64): MIN_LIBVIRT_NUMA_VERSION, ++ (arch.PPC64, ++ arch.PPC64LE): MIN_LIBVIRT_NUMA_VERSION_PPC} ++ caps = self._host.get_capabilities() ++@@ -5222,7 +5222,7 @@ class LibvirtDriver(driver.ComputeDriver): ++ def _has_hugepage_support(self): ++ # This means that the host can support multiple values for the size ++ # field in LibvirtConfigGuestMemoryBackingPage ++- supported_archs = [arch.I686, arch.X86_64] +++ supported_archs = [arch.I686, arch.X86_64, arch.AARCH64] ++ caps = self._host.get_capabilities() ++ return ((caps.host.cpu.arch in supported_archs) and ++ self._host.has_min_version(MIN_LIBVIRT_HUGEPAGE_VERSION, +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +index 3647f9b..c53409c 100644 +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -347,6 +347,18 @@ class openstack_tasks::roles::compute { + unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch", + cwd => $nova_path, + require => [Package['patch']], ++ } -> ++ # FIXME(armband): Add AArch64 to arch list for nova hugepage support ++ file { "${nova_path}/nova-AArch64-enable-hugepage-support.patch": ++ ensure => "file", ++ source => "puppet:///modules/openstack/nova-AArch64-enable-hugepage-support.patch", ++ } -> ++ exec { 'nova AArch64 enable hugepage support': ++ path => ['/usr/bin'], ++ command => "patch -p1 < ${nova_path}/nova-AArch64-enable-hugepage-support.patch", ++ unless => "patch -p1 -R -N --dry-run < ${nova_path}/nova-AArch64-enable-hugepage-support.patch", ++ cwd => $nova_path, ++ require => [Package['patch']], + } + + class { '::nova::availability_zone': |