summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-08 22:26:04 +0000
committerGerrit Code Review <review@openstack.org>2018-06-08 22:26:04 +0000
commitfcf5da99f7082b51688870dc7e004a277b233a7d (patch)
tree67e3bbb943556a95161e25f425767400e934df87
parent12e87ac0dbc92d25be748c65f9e5c5eed6c7724b (diff)
parentaae8a863095df7432e85703d7096b561ecc3574f (diff)
Merge "Check node processes earlier"
-rw-r--r--sahara/service/api/v10.py2
-rw-r--r--sahara/service/api/v2/clusters.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/sahara/service/api/v10.py b/sahara/service/api/v10.py
index fd182cc..656e5b0 100644
--- a/sahara/service/api/v10.py
+++ b/sahara/service/api/v10.py
@@ -125,8 +125,8 @@ def _cluster_create(values, plugin):
125 plugin.recommend_configs(cluster) 125 plugin.recommend_configs(cluster)
126 cluster = c_u.change_cluster_status( 126 cluster = c_u.change_cluster_status(
127 cluster, c_u.CLUSTER_STATUS_VALIDATING) 127 cluster, c_u.CLUSTER_STATUS_VALIDATING)
128 quotas.check_cluster(cluster)
129 plugin.validate(cluster) 128 plugin.validate(cluster)
129 quotas.check_cluster(cluster)
130 except Exception as e: 130 except Exception as e:
131 with excutils.save_and_reraise_exception(): 131 with excutils.save_and_reraise_exception():
132 c_u.change_cluster_status( 132 c_u.change_cluster_status(
diff --git a/sahara/service/api/v2/clusters.py b/sahara/service/api/v2/clusters.py
index 632f50e..9f63225 100644
--- a/sahara/service/api/v2/clusters.py
+++ b/sahara/service/api/v2/clusters.py
@@ -126,8 +126,8 @@ def _cluster_create(values, plugin):
126 plugin.recommend_configs(cluster) 126 plugin.recommend_configs(cluster)
127 cluster = c_u.change_cluster_status( 127 cluster = c_u.change_cluster_status(
128 cluster, c_u.CLUSTER_STATUS_VALIDATING) 128 cluster, c_u.CLUSTER_STATUS_VALIDATING)
129 quotas.check_cluster(cluster)
130 plugin.validate(cluster) 129 plugin.validate(cluster)
130 quotas.check_cluster(cluster)
131 except Exception as e: 131 except Exception as e:
132 with excutils.save_and_reraise_exception(): 132 with excutils.save_and_reraise_exception():
133 c_u.change_cluster_status( 133 c_u.change_cluster_status(