From b1d99d2e0a66fa680a4fc72d0810358d425b97e1 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Tue, 19 Apr 2016 18:18:23 +0300 Subject: [PATCH] CID-472: fix incorrect check --- .../stack_executor/stack_servers_persister.rb | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/devops-service/lib/executors/stack_executor/stack_servers_persister.rb b/devops-service/lib/executors/stack_executor/stack_servers_persister.rb index bfbb1a3..357fe3a 100644 --- a/devops-service/lib/executors/stack_executor/stack_servers_persister.rb +++ b/devops-service/lib/executors/stack_executor/stack_servers_persister.rb @@ -8,14 +8,7 @@ class Devops::Executor::StackExecutor @stack = stack @project = mongo.project(stack.project) @deploy_env = @project.deploy_env(stack.deploy_env) - @already_used_incrementers_values = mongo.stack_servers(stack.name).inject({}) do |hash, server| - next hash unless server.stack_info['incrementers_values'] - server.stack_info['incrementers_values'].each do |name, value| - hash[name] ||= [] - hash[name] << value - end - hash - end + @already_used_incrementers_values = get_already_used_incrementers_values end def persist(provider_info) @@ -44,6 +37,18 @@ class Devops::Executor::StackExecutor private + def get_already_used_incrementers_values + mongo.stack_servers(stack.name).inject({}) do |hash, server| + incrementers_values = server.stack_info && server.stack_info['incrementers_values'] + next hash unless incrementers_values + incrementers_values.each do |name, value| + hash[name] ||= [] + hash[name] << value + end + hash + end + end + def apply_name_builder(server_attrs, provider_info) name_builder = get_name_builder(provider_info) server_attrs['chef_node_name'] = name_builder.build_node_name