tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

set run_list to node from chef-server (after bootstrap), -r option for chef-client if server from stack

Browse Source
This commit is contained in:
Anton Martynov 2015-10-01 17:27:04 +03:00
parent e8677efc69
commit f764db18ed
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devops-service/lib/executors/server_executor.rb
View File

@ -252,12 +252,12 @@ module Devops
begin begin
#raise "hello" #raise "hello"
@out << "\n" @out << "\n"
run_list = compute_run_list
@out << "\nComputed run list: #{run_list.join(", ")}"
@out.flush @out.flush
# run_list = @server.run_list + provider.run_list @knife_instance.set_run_list(@server.chef_node_name, run_list)
# @out << "\nRun list: #{run_list.inspect}" deploy_info = @project.deploy_info(@deploy_env)
# s.options[:run_list] += run_list deploy_status = deploy_server(deploy_info)
# @knife_instance.set_run_list(@server.chef_node_name, run_list)
deploy_status = deploy_server(@project.deploy_info(@deploy_env))
if deploy_status == 0 if deploy_status == 0
0 0
else else
@ -346,7 +346,7 @@ module Devops
@out.flush @out.flush
cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}" cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}"
else else
cmd << " -r #{deploy_info["run_list"].join(",")}" cmd << " -r #{deploy_info["run_list"].join(",")}" unless @server.stack.nil?
end end
ip = if @server.public_ip.nil? ip = if @server.public_ip.nil?
@server.private_ip @server.private_ip
@ -433,16 +433,28 @@ module Devops
out << "Project run list: #{@project.run_list.join(", ")}\n" out << "Project run list: #{@project.run_list.join(", ")}\n"
out << "Deploy environment run list: #{@deploy_env.run_list.join(", ")}\n" out << "Deploy environment run list: #{@deploy_env.run_list.join(", ")}\n"
out << "Server run list: #{@server.run_list.join(", ")}\n" out << "Server run list: #{@server.run_list.join(", ")}\n"
=begin
rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list) rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list)
if @server.stack if @server.stack
stack = Devops::Db.connector.stack(@server.stack) stack = Devops::Db.connector.stack(@server.stack)
out << "Stack run list: #{stack.run_list.join(", ")}\n" out << "Stack run list: #{stack.run_list.join(", ")}\n"
rlist.merge(stack.run_list) rlist.merge(stack.run_list)
end end
deploy_info["run_list"] = rlist.to_a =end
deploy_info["run_list"] = compute_run_list
out << "New deploy run list: #{deploy_info["run_list"].join(", ")}\nRun list has been generated\n\n" out << "New deploy run list: #{deploy_info["run_list"].join(", ")}\nRun list has been generated\n\n"
end end
def compute_run_list
rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list)
if @server.stack
stack = Devops::Db.connector.stack(@server.stack)
out << "Stack run list: #{stack.run_list.join(", ")}\n"
rlist.merge(stack.run_list)
end
rlist.to_a
end
private private
def schedule_expiration(server) def schedule_expiration(server)