diff --git a/0016-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch b/0016-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa5654aefe463a7a95d1de7224a993152eb3b3b0 --- /dev/null +++ b/0016-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch @@ -0,0 +1,28 @@ +From 835de4cfbf8b656c03852a198d5546b11575bceb Mon Sep 17 00:00:00 2001 +From: yangxiaoliang +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 + +--- + 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 + diff --git a/ceph.spec b/ceph.spec index 24bb0e28c7bdb5e43fecc2d49d69c9f8e0a4ca19..b024ec1be7955be52fadd17e0fccc93c1b39287b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 17 +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 +Patch16: 0016-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 +* Fri Mar 17 2023 yangxiaoliang - 2:16.2.7-19 +- add judgment for ceph-volume lvm activate + * Wed Mar 1 2023 wangzengliang - 2:16.2.7-17 - fix error for uninstall cephadm