Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
infra
packages
Commits
3324f0af
Commit
3324f0af
authored
5 years ago
by
Lars Beckers
Browse files
Options
Downloads
Patches
Plain Diff
add ganeti upstream patch for ceph mimic compat
parent
8b6917f3
No related branches found
No related tags found
No related merge requests found
Pipeline
#1836
canceled
5 years ago
Stage: build
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
patches/ganeti/fix_rbd_showmapped_mimic.patch
+33
-0
33 additions, 0 deletions
patches/ganeti/fix_rbd_showmapped_mimic.patch
scripts/ganeti.sh
+1
-0
1 addition, 0 deletions
scripts/ganeti.sh
with
34 additions
and
0 deletions
patches/ganeti/fix_rbd_showmapped_mimic.patch
0 → 100644
+
33
−
0
View file @
3324f0af
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:
This diff is collapsed.
Click to expand it.
scripts/ganeti.sh
+
1
−
0
View file @
3324f0af
...
...
@@ -8,6 +8,7 @@ import_patches ganeti
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 upstream patch for Ceph mimic compatibility."
install_build_deps
build
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment