Merge branch 'master' into fix-ldap-auth

Mirantis · Mar 6, 2018 · e901805 · e901805
2 parents e7ba9f0 + 66e5715
commit e901805
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/kqueen/engines/manual.py b/kqueen/engines/manual.py
@@ -44,14 +44,13 @@ def cluster_get(self):
         """
         Implementation of :func:`~kqueen.engines.base.BaseEngine.cluster_get`
         """
-        if self.cluster.kubeconfig:
-            try:
-                client = KubernetesAPI(cluster=self.cluster)
-                client.get_version()
-            except Exception as e:
-                msg = 'Fetching data from backend for cluster {} failed with following reason:'.format(self.cluster.id)
-                logger.exception(msg)
-                return {'state': config.get('CLUSTER_ERROR_STATE')}
+        try:
+            client = KubernetesAPI(cluster=self.cluster)
+            client.get_version()
+        except Exception as e:
+            msg = 'Fetching data from backend for cluster {} failed with following reason:'.format(self.cluster.id)
+            logger.exception(msg)
+            return {'state': config.get('CLUSTER_ERROR_STATE')}
         return {'state': config.get('CLUSTER_OK_STATE')}
 
     def provision(self):