From 6fb077903d09949cb09b4dd49fec089e33c3326a Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Wed, 12 Aug 2015 09:41:19 +0300
Subject: [PATCH] some fixes

---
 devops-service/app/api2/handlers/deploy.rb      | 2 +-
 devops-service/core/devops-service.rb           | 2 +-
 devops-service/lib/executors/server_executor.rb | 2 +-
 devops-service/lib/knife/knife_factory.rb       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devops-service/app/api2/handlers/deploy.rb b/devops-service/app/api2/handlers/deploy.rb
index affb695..600b337 100644
--- a/devops-service/app/api2/handlers/deploy.rb
+++ b/devops-service/app/api2/handlers/deploy.rb
@@ -1,4 +1,4 @@
-require "executors/server_executor"
+require "lib/executors/server_executor"
 require "commands/status"
 require "workers/deploy_worker"
 require "exceptions/deploy_info_error"
diff --git a/devops-service/core/devops-service.rb b/devops-service/core/devops-service.rb
index cbfe269..776be2f 100644
--- a/devops-service/core/devops-service.rb
+++ b/devops-service/core/devops-service.rb
@@ -19,7 +19,7 @@ require_relative "devops-db"
 require_relative "devops-logger"
 require_relative "devops-application"
 
-require "knife/knife_factory"
+require "lib/knife/knife_factory"
 
 require_relative "../sinatra/methods_with_headers"
 
diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb
index e5b57d4..df0f1f5 100644
--- a/devops-service/lib/executors/server_executor.rb
+++ b/devops-service/lib/executors/server_executor.rb
@@ -1,4 +1,4 @@
-require "knife/knife_factory"
+require "lib/knife/knife_factory"
 
 module Devops
   module Executor
diff --git a/devops-service/lib/knife/knife_factory.rb b/devops-service/lib/knife/knife_factory.rb
index 10370dc..117ca0f 100644
--- a/devops-service/lib/knife/knife_factory.rb
+++ b/devops-service/lib/knife/knife_factory.rb
@@ -4,8 +4,8 @@ class KnifeFactory
 
   class << self
     def init
-      c = DevopsConfig.config[:knife_config]
-      raise "Option ':knife_config' is undefined, please check config.rb file" unless c
+      c = DevopsConfig.config[:knife_config_file]
+      raise "Option ':knife_config_file' is undefined, please check config.rb file" unless c
       @instance = KnifeCommands.new(c)
     end