From: John Spray <jspray@redhat.com>
Date: Fri, 12 Oct 2018 15:56:51 +0000 (+0100)
Subject: Merge branch 'master' into orchestrator-fix-rook-cluster-in-name
X-Git-Tag: v14.0.1~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24560%2Fhead;p=ceph.git

Merge branch 'master' into orchestrator-fix-rook-cluster-in-name
---

ea75b20ce9198ade70a326a98cb78d7f4a5d9905
diff --cc src/pybind/mgr/rook/module.py
index 87c5e87de492,6677a10a0148..b11c3293b40c
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@@ -186,8 -186,8 +186,8 @@@ class RookOrchestrator(MgrModule, orche
  
      def available(self):
          if not kubernetes_imported:
-             return False, "`kubernetes` module not found"
+             return False, "`kubernetes` python module not found"
 -        elif not self._in_cluster():
 +        elif not self._in_cluster_name:
              return False, "ceph-mgr not running in Rook cluster"
  
          try: