packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!187 ceph-volume: add judgment for ceph-volume lvm activate

Browse Source 
From: @ceph_yang 
Reviewed-by: @liuqinfei, @rosinL 
Signed-off-by: @liuqinfei
This commit is contained in:
openeuler-ci-bot 2023-04-11 03:48:07 +00:00 committed by Gitee
commit 2875b0811a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0015-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch Normal file
View File

@ -0,0 +1,28 @@
From 835de4cfbf8b656c03852a198d5546b11575bceb Mon Sep 17 00:00:00 2001
From: yangxiaoliang <yangxiaoliang07@163.com>
Date: Wed, 7 Sep 2022 07:47:00 +0000
Subject: [PATCH] ceph-volume: add judgment for ceph-volume lvm activate If
only osd_fsid is given, needed `ceph-volume lvm activate "" {osd_fsid}` now
we just need ceph-volume lvm activate {osd_fsid} Signed-off-by: Xiaoliang
Yang <yangxiaoliang07@163.com>
---
src/ceph-volume/ceph_volume/devices/lvm/activate.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 70fceeab645..3539e297d57 100644
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -364,6 +364,8 @@ class Activate(object):
if len(self.argv) == 0:
print(sub_command_help)
return
+ if not self.argv[0].isdigit() and self.argv[0]:
+ self.argv.insert(0, "")
args = parser.parse_args(self.argv)
# Default to bluestore here since defaulting it in add_argument may
# cause both to be True
--
2.33.0

6
ceph.spec
View File

@ -125,7 +125,7 @@
#################################################################################
Name: ceph
Version: 16.2.7
Release: 18
Release: 19
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2
%endif
@ -157,6 +157,7 @@ Patch11: 0011-fix-no-module-named-v1_event-for-mgr-k8sevent.patch
Patch12: 0012-add-missing-includes-when-compiling-with-boost-1.75.patch
Patch13: 0013-add-atomic-library-for-loongarch64.patch
Patch14: 0014-fix-CVE-2022-3854.patch
Patch15: 0015-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -2504,6 +2505,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
* Mon Apr 10 2023 yangxiaoliang <yangxiaoliang07@163.com> - 2:16.2.7-19
- add judgment for ceph-volume lvm activate
* Sat Mar 25 2023 wangzengliang <wangzengliang2@huawei.com> - 2:16.2.7-18
- format userdel command