From f51df952e69c71b020a123819d6a64cba0162839 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 12 Aug 2016 15:37:00 +0300 Subject: [PATCH] set run list without executor --- devops-service/lib/executors/server_executor.rb | 4 ---- devops-service/workers/wait_rebootstrap_worker.rb | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index eaff8ab..db2171e 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -519,10 +519,6 @@ module Devops raise 'Failed to sync project metadata with chef' unless succeeded end - def set_run_list(run_list) - knife_instance.set_run_list(@server.chef_node_name, run_list) - end - private def schedule_expiration diff --git a/devops-service/workers/wait_rebootstrap_worker.rb b/devops-service/workers/wait_rebootstrap_worker.rb index f32c280..4cb8801 100644 --- a/devops-service/workers/wait_rebootstrap_worker.rb +++ b/devops-service/workers/wait_rebootstrap_worker.rb @@ -1,6 +1,5 @@ require File.join(File.dirname(__FILE__), "worker") -require "lib/executors/server_executor" require "db/mongo/models/report" class WaitRebootstrapWorker < Worker @@ -10,6 +9,7 @@ class WaitRebootstrapWorker < Worker # 'server_node_name' # 'owner' # 'old_chef_node': node info + # 'new_chef_env' def perform(options) call do @@ -25,8 +25,8 @@ class WaitRebootstrapWorker < Worker puts_and_flush "Setting run list to #{old_node_info['run_list']}" - executor = Devops::Executor::ServerExecutor.new(server, out, current_user: owner) - executor.set_run_list(old_node_info["run_list"]) + knife_instance = KnifeFactory.instance(options.fetch("new_chef_env")) + knife_instance.set_run_list(server.chef_node_name, old_node_info["run_list"]) 0 end end @@ -40,4 +40,3 @@ class WaitRebootstrapWorker < Worker ) end end -