Blame SOURCES/sos-bz1438269-ceph-collect-etc-calamari.patch
|
 |
084cc6 |
From 44f3e7332516f09738dc865e943eb70eceb50553 Mon Sep 17 00:00:00 2001
|
|
|
084cc6 |
From: "Bryn M. Reeves" <bmr@redhat.com>
|
|
|
084cc6 |
Date: Thu, 20 Apr 2017 16:19:46 +0100
|
|
|
084cc6 |
Subject: [PATCH] [ceph] fix list formatting
|
|
|
084cc6 |
|
|
|
084cc6 |
Fix the formatting of the add_copy_spec() lists in ceph: make the
|
|
|
084cc6 |
first conform to the sos bracing and indenting rules for lists in
|
|
|
084cc6 |
argument tuples, and fix a missing comma in the second.
|
|
|
084cc6 |
|
|
|
084cc6 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
084cc6 |
---
|
|
|
084cc6 |
sos/plugins/ceph.py | 5 +++--
|
|
|
084cc6 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
084cc6 |
|
|
|
084cc6 |
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
|
|
|
084cc6 |
index 06b8605..afb6e24 100644
|
|
|
084cc6 |
--- a/sos/plugins/ceph.py
|
|
|
084cc6 |
+++ b/sos/plugins/ceph.py
|
|
|
084cc6 |
@@ -40,7 +40,8 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
084cc6 |
self.add_copy_spec([
|
|
|
084cc6 |
"/var/log/ceph/*.log",
|
|
|
084cc6 |
"/var/log/radosgw/*.log",
|
|
|
084cc6 |
- "/var/log/calamari/*.log"], sizelimit=limit)
|
|
|
084cc6 |
+ "/var/log/calamari/*.log"
|
|
|
084cc6 |
+ ], sizelimit=limit)
|
|
|
084cc6 |
else:
|
|
|
084cc6 |
self.add_copy_spec([
|
|
|
084cc6 |
"/var/log/ceph/",
|
|
|
084cc6 |
@@ -50,7 +51,7 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
084cc6 |
|
|
|
084cc6 |
self.add_copy_spec([
|
|
|
084cc6 |
"/etc/ceph/",
|
|
|
084cc6 |
- "/etc/calamari/"
|
|
|
084cc6 |
+ "/etc/calamari/",
|
|
|
084cc6 |
"/var/lib/ceph/",
|
|
|
084cc6 |
"/var/run/ceph/"
|
|
|
084cc6 |
])
|
|
|
084cc6 |
--
|
|
|
084cc6 |
2.7.4
|
|
|
084cc6 |
|