Skip to content
Snippets Groups Projects
Commit 66ff9bc2 authored by Ciarán McKenna's avatar Ciarán McKenna
Browse files

Update ganeti package for buster to 3.01 + fsmpi patches

parent 1dc37387
Branches
Tags
No related merge requests found
Pipeline #4208 failed
...@@ -18,6 +18,7 @@ before_script: ...@@ -18,6 +18,7 @@ before_script:
# yamllint disable rule:line-length # yamllint disable rule:line-length
- echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main" > /etc/apt/sources.list.d/buster_src.list - echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main" > /etc/apt/sources.list.d/buster_src.list
- echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster-updates main" >> /etc/apt/sources.list.d/buster_src.list - echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster-updates main" >> /etc/apt/sources.list.d/buster_src.list
- echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster-backports main" >> /etc/apt/sources.list.d/buster_src.list
- echo "deb-src http://security.debian.org/ buster/updates main" >> /etc/apt/sources.list.d/buster_src.list - echo "deb-src http://security.debian.org/ buster/updates main" >> /etc/apt/sources.list.d/buster_src.list
# yamllint enable rule:line-length # yamllint enable rule:line-length
- apt-get update - apt-get update
......
Index: ganeti-2.15.2/lib/hypervisor/hv_kvm/__init__.py Index: ganeti-3.01/lib/hypervisor/hv_kvm/__init__.py
=================================================================== ===================================================================
--- ganeti-2.15.2.orig/lib/hypervisor/hv_kvm/__init__.py --- ganeti-3.01.orig/lib/hypervisor/hv_kvm/__init__.py
+++ ganeti-2.15.2/lib/hypervisor/hv_kvm/__init__.py +++ ganeti-3.01/lib/hypervisor/hv_kvm/__init__.py
@@ -921,12 +921,13 @@ class KVMHypervisor(hv_base.BaseHypervis @@ -921,12 +921,13 @@ class KVMHypervisor(hv_base.BaseHypervis
disk_cache = up_hvp[constants.HV_DISK_CACHE] disk_cache = up_hvp[constants.HV_DISK_CACHE]
for cfdev, link_name, uri in kvm_disks: for cfdev, link_name, uri in kvm_disks:
......
From fa9a8fc141334b176380370b9622a28ad4a066fb Mon Sep 17 00:00:00 2001
From: Ansgar Jazdzewski <ajaz@spreadshirt.net>
Date: Tue, 19 Feb 2019 10:31:07 +0100
Subject: [PATCH] fix 'rbd showmapped' for ceph mimic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The json ouput changed from list to dict
* http://docs.ceph.com/docs/master/releases/mimic/ - The rbd CLI’s
showmapped JSON and XML output has changed.)
---
lib/storage/bdev.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/storage/bdev.py b/lib/storage/bdev.py
index c7d5f3b6d..7aa09cee6 100644
--- a/lib/storage/bdev.py
+++ b/lib/storage/bdev.py
@@ -1064,8 +1064,12 @@ def _ParseRbdShowmappedJson(output, volume_pool, volume_name):
except ValueError, err:
base.ThrowError("Unable to parse JSON data: %s" % err)
+ # since ceph mimic the json output changed from dict to list
+ if isinstance(devices, dict):
+ devices = devices.values()
+
rbd_dev = None
- for d in devices.values(): # pylint: disable=E1103
+ for d in devices:
try:
name = d["name"]
except KeyError:
--- a/src/Ganeti/HTools/Types.hs 2015-12-16 14:34:43.000000000 +0100
+++ b/src/Ganeti/HTools/Types.hs 2017-11-03 21:42:53.486742240 +0100
@@ -215,7 +215,7 @@
}
maxDisks :: Int
-maxDisks = 16
+maxDisks = 64
maxNics :: Int
maxNics = 8
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
source "${BASH_SOURCE%/*}/common.sh" source "${BASH_SOURCE%/*}/common.sh"
get_sources ganeti buster get_sources ganeti buster-backports
import_patches ganeti import_patches ganeti
dch_custom "Remove blockdev storage from the movable and mirrored devices lists." dch_custom "Remove blockdev storage from the movable and mirrored devices lists."
dch_custom "Increase maximum disk count per instance."
dch_custom "Add support for disk cache usage with rbd devices." dch_custom "Add support for disk cache usage with rbd devices."
dch_custom "Add upstream patch for Ceph mimic compatibility."
install_build_deps install_build_deps
build build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment