Merge pull request #121 from Mirantis/cluster-deploy

Fix cluster deployment

.gitignore

@@ -107,5 +107,5 @@ ENV/
 node_modules/
 
 # DO NOT COMMIT LOCAL CONFIG
-kqueen/config_local.py
+kqueen/config/local.py
 

kqueen/blueprints/api/views.py

@@ -71,12 +71,20 @@ def after_save(self):
 
         if not prov_status:
             logger.error('Provisioning failed: {}'.format(prov_msg))
-            abort(500)
+            abort(500, description=prov_msg)
 
 
 class GetCluster(GetView):
     object_class = Cluster
 
+    def dispatch_request(self, *args, **kwargs):
+        self.check_access()
+
+        cluster = self.get_content(*args, **kwargs)
+        cluster.get_state()
+
+        return jsonify(cluster)
+
 
 class UpdateCluster(UpdateView):
     object_class = Cluster

kqueen/engines/jenkins.py

@@ -106,12 +106,12 @@ def provision(self, **kwargs):
         ctx['STACK_NAME'] = 'KQUEEN__{}'.format(cluster_id)
         try:
             self.client.build_job(self.provision_job_name, ctx)
-            return (True, None)
+            return True, None
         except Exception as e:
             msg = 'Creating cluster {} failed with following reason: {}'.format(cluster_id, repr(e))
             logger.error(msg)
-            return (False, msg)
-        return (None, None)
+            return False, msg
+        return None, None
 
     def deprovision(self, **kwargs):
         """