Cluster scaling bug fixing

And a little code improvement

Fixes: bug #1202562

Change-Id: I5786278575a93fc731d5b47341beafb79337973b
This commit is contained in:
Nadya Privalova
2013-07-18 13:25:17 +04:00
parent b84bc80194
commit 4e8404ee46
2 changed files with 2 additions and 3 deletions

View File

@@ -61,8 +61,7 @@ def decommission_dn(nn, inst_to_be_deleted, survived_inst):
'/etc/hadoop/dn.excl': "",
})
break
else:
att_amount -= 1
att_amount -= 1
if not att_amount:
raise Exception("Cannot finish decommission")

View File

@@ -188,7 +188,7 @@ def convert_to_cluster_template(plugin_name, version, config_file):
def construct_ngs_for_scaling(additional_node_groups):
additional = {}
for ng in additional_node_groups:
tmpl_id = ng['node_group_template_id']
tmpl_id = ng.get('node_group_template_id')
count = ng['count']
if tmpl_id:
tmpl = get_node_group_template(id=tmpl_id)