Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 268414ce authored by JACQUOT Pierre's avatar JACQUOT Pierre Committed by JACQUOT Pierre
Browse files

[refrepo][oarproperties] Do not try to do an addition if next_id is 'NO'

(It will fail, because next_id is a string...)
parent 409872a3
No related branches found
No related tags found
1 merge request!499[toulouse][montcalm] Configure vlans for montcalm cluster.
...@@ -1204,6 +1204,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s ...@@ -1204,6 +1204,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
phys_rsc_map.each do |physical_resource, variables| phys_rsc_map.each do |physical_resource, variables|
# if it's a new cluster, or the cluster doesn't have resource ids for this kind of resources # if it's a new cluster, or the cluster doesn't have resource ids for this kind of resources
if is_a_new_cluster or cluster_resources.map{|r| r[physical_resource]}.select{|x| not x.nil?}.empty? if is_a_new_cluster or cluster_resources.map{|r| r[physical_resource]}.select{|x| not x.nil?}.empty?
next if next_rsc_ids[physical_resource] == 'NO'
variables[:current_ids] = [*next_rsc_ids[physical_resource]+1..next_rsc_ids[physical_resource]+variables[:per_cluster_count]] variables[:current_ids] = [*next_rsc_ids[physical_resource]+1..next_rsc_ids[physical_resource]+variables[:per_cluster_count]]
next_rsc_ids[physical_resource] = variables[:per_server_count] > 0 ? variables[:current_ids].max : next_rsc_ids[physical_resource] next_rsc_ids[physical_resource] = variables[:per_server_count] > 0 ? variables[:current_ids].max : next_rsc_ids[physical_resource]
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment