]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm:toleration fix for API consistency in dashboard
authorPaul Cuzner <pcuzner@redhat.com>
Wed, 3 Feb 2021 19:57:16 +0000 (08:57 +1300)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 23 Feb 2021 09:58:23 +0000 (10:58 +0100)
The function signatire change to "available" needed a
patch to the dashboard>orchestratior interface. This patch
just tolerates the change - if or how to consume the
additional data from "available" is yet to be deternined.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit e36e1d20acf4534133bcc14dab62cc5465667a62)

src/pybind/mgr/dashboard/services/orchestrator.py

index 291c39d91f1951d012070b2419c49b612c3f56f4..3d25091e29960cbbb848906523d81dee3d7c1c60 100644 (file)
@@ -23,7 +23,7 @@ class OrchestratorAPI(OrchestratorClientMixin):
 
     def status(self):
         try:
-            status, message = super().available()
+            status, message, _module_details = super().available()
             logger.info("is orchestrator available: %s, %s", status, message)
             return dict(available=status, message=message)
         except (RuntimeError, OrchestratorError, ImportError) as e: