From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 15:55:01 +0000 (-0600)
Subject: mgr/cephadm: upgrade requires root mode for now
X-Git-Tag: v15.1.1~68^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a09e01fd21c8ba15a3f9538f703b56e502b6960d;p=ceph.git

mgr/cephadm: upgrade requires root mode for now

See https://tracker.ceph.com/issues/44429

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 3ccf0caec833..1f4361796e09 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2785,6 +2785,9 @@ receivers:
         return trivial_result(r)
 
     def upgrade_start(self, image, version):
+        if self.mode != 'root':
+            raise OrchestratorError('upgrade is not supported in %s mode' % (
+                self.mode))
         if version:
             target_name = self.container_image_base + ':v' + version
         elif image: