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

set run list without executor

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-08-12 15:37:00 +03:00
parent 6033d9fbd6
commit f51df952e6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,10 +519,6 @@ module Devops
raise 'Failed to sync project metadata with chef' unless succeeded raise 'Failed to sync project metadata with chef' unless succeeded
end end
def set_run_list(run_list)
knife_instance.set_run_list(@server.chef_node_name, run_list)
end
private private
def schedule_expiration def schedule_expiration

7
devops-service/workers/wait_rebootstrap_worker.rb
View File

@ -1,6 +1,5 @@
require File.join(File.dirname(__FILE__), "worker") require File.join(File.dirname(__FILE__), "worker")
require "lib/executors/server_executor"
require "db/mongo/models/report" require "db/mongo/models/report"
class WaitRebootstrapWorker < Worker class WaitRebootstrapWorker < Worker
@ -10,6 +9,7 @@ class WaitRebootstrapWorker < Worker
# 'server_node_name' # 'server_node_name'
# 'owner' # 'owner'
# 'old_chef_node': node info # 'old_chef_node': node info
# 'new_chef_env'
def perform(options) def perform(options)
call do call do
@ -25,8 +25,8 @@ class WaitRebootstrapWorker < Worker
puts_and_flush "Setting run list to #{old_node_info['run_list']}" puts_and_flush "Setting run list to #{old_node_info['run_list']}"
executor = Devops::Executor::ServerExecutor.new(server, out, current_user: owner) knife_instance = KnifeFactory.instance(options.fetch("new_chef_env"))
executor.set_run_list(old_node_info["run_list"]) knife_instance.set_run_list(server.chef_node_name, old_node_info["run_list"])
0 0
end end
end end
@ -40,4 +40,3 @@ class WaitRebootstrapWorker < Worker
) )
end end
end end