CID-472: fix incorrect check
This commit is contained in:
parent
56b7c914d1
commit
b1d99d2e0a
@ -8,14 +8,7 @@ class Devops::Executor::StackExecutor
|
|||||||
@stack = stack
|
@stack = stack
|
||||||
@project = mongo.project(stack.project)
|
@project = mongo.project(stack.project)
|
||||||
@deploy_env = @project.deploy_env(stack.deploy_env)
|
@deploy_env = @project.deploy_env(stack.deploy_env)
|
||||||
@already_used_incrementers_values = mongo.stack_servers(stack.name).inject({}) do |hash, server|
|
@already_used_incrementers_values = get_already_used_incrementers_values
|
||||||
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
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def persist(provider_info)
|
def persist(provider_info)
|
||||||
@ -44,6 +37,18 @@ class Devops::Executor::StackExecutor
|
|||||||
|
|
||||||
private
|
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)
|
def apply_name_builder(server_attrs, provider_info)
|
||||||
name_builder = get_name_builder(provider_info)
|
name_builder = get_name_builder(provider_info)
|
||||||
server_attrs['chef_node_name'] = name_builder.build_node_name
|
server_attrs['chef_node_name'] = name_builder.build_node_name
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user