disable broken ceph-mgr module

diff --git a/patches/0005-ceph-mgr-fix-package-description.patch b/patches/0005-ceph-mgr-fix-package-description.patch
new file mode 100644 (file)
index 0000000..703f982
--- /dev/null
+++ b/patches/0005-ceph-mgr-fix-package-description.patch
@@ -0,0 +1,29 @@
+From 7437c66185bb565a3e9b5e29c297bf769de162fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 18 May 2017 14:35:19 +0200
+Subject: [PATCH 5/6] ceph-mgr: fix package description
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ debian/control | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/control b/debian/control
+index eb91c40..c2303f0 100644
+--- a/debian/control
++++ b/debian/control
+@@ -164,7 +164,7 @@ Depends: ceph-base (= ${binary:Version}),
+          ${shlibs:Depends}
+ Replaces: ceph (<< 0.93-417)
+ Breaks: ceph (<< 0.93-417)
+-Description: metadata server for the ceph distributed file system
++Description: manager for the ceph distributed file system
+  Ceph is a massively scalable, open-source, distributed
+  storage system that runs on commodity hardware and delivers object,
+  block and file system storage.
+-- 
+2.1.4
+

diff --git a/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch b/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch
new file mode 100644 (file)
index 0000000..5b6592e
--- /dev/null
+++ b/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch
@@ -0,0 +1,29 @@
+From f174680b7caf53c4dcc6183cdb437bbc3df5596c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 1 Jun 2017 10:28:13 +0200
+Subject: [PATCH 6/6] ceph-mgr: don't load broken rest module by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ src/common/config_opts.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/config_opts.h b/src/common/config_opts.h
+index eff246e..4e1e9da 100644
+--- a/src/common/config_opts.h
++++ b/src/common/config_opts.h
+@@ -1679,7 +1679,7 @@ OPTION(rgw_shard_warning_threshold, OPT_DOUBLE, 90) // pct of safe max
+ OPTION(rgw_swift_versioning_enabled, OPT_BOOL, false) // whether swift object versioning feature is enabled
+ 
+ OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr") // where to load python modules from
+-OPTION(mgr_modules, OPT_STR, "rest")  // Which modules to load
++OPTION(mgr_modules, OPT_STR, "")  // Which modules to load
+ OPTION(mgr_data, OPT_STR, "/var/lib/ceph/mgr/$cluster-$id") // where to find keyring etc
+ OPTION(mgr_beacon_period, OPT_INT, 5)  // How frequently to send beacon
+ OPTION(mgr_stats_period, OPT_INT, 5) // How frequently to send stats
+-- 
+2.1.4
+

diff --git a/patches/series b/patches/series
index e52972679d802ab17a4f28a0fbcf2def611b0d19..7da8d69c60185b124570e95faed29ee611c020a8 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -2,3 +2,5 @@
 0002-cmake-disable-version-from-git.patch
 0003-ceph-detect-init-support-Debian-Stretch.patch
 0004-enable-systemd-targets-by-default.patch
+0005-ceph-mgr-fix-package-description.patch
+0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch