From: Paul Cuzner <pcuzner@redhat.com>
Date: Wed, 3 Feb 2021 19:57:16 +0000 (+1300)
Subject: mgr/cephadm:toleration fix for API consistency in dashboard
X-Git-Tag: v17.1.0~3032^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e36e1d20acf4534133bcc14dab62cc5465667a62;p=ceph.git

mgr/cephadm:toleration fix for API consistency in dashboard

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>
---

diff --git a/src/pybind/mgr/dashboard/services/orchestrator.py b/src/pybind/mgr/dashboard/services/orchestrator.py
index 291c39d91f19..3d25091e2996 100644
--- a/src/pybind/mgr/dashboard/services/orchestrator.py
+++ b/src/pybind/mgr/dashboard/services/orchestrator.py
@@ -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: