From 05e9ef3266e11337334d39c5228932835da2a9c5 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Mon, 10 Aug 2015 13:17:04 +0300
Subject: [PATCH] fixed bootstrap stream

---
 devops-service/app/api2/handlers/server.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/devops-service/app/api2/handlers/server.rb b/devops-service/app/api2/handlers/server.rb
index e26ef48..6bfa0e8 100644
--- a/devops-service/app/api2/handlers/server.rb
+++ b/devops-service/app/api2/handlers/server.rb
@@ -143,20 +143,22 @@ module Devops
 
         # TODO: check bootstrap template name
         def bootstrap_server_stream out
-          s = prepare_create_server
+          s, rl, bt = prepare_bootstrap_server
           status = []
           cert = Devops::Db.connector.key s.key
-          logger.debug "Bootstrap certificate path: #{cert.path}"
-          bootstrap s, out, cert.path, logger
+          DevopsLogger.logger.debug "Bootstrap certificate path: #{cert.path}"
+          #bootstrap s, out, cert.path, logger
+          provider = ::Provider::ProviderFactory.get(s.provider)
+          r = two_phase_bootstrap s, provider.run_list, bt, cert.path, out
           str = nil
           r = if check_server(s)
             Devops::Db.connector.server_set_chef_node_name s
             str = "Server with id '#{s.id}' is bootstraped"
-            logger.info str
+            DevopsLogger.logger.info str
             0
           else
             str = "Server with id '#{s.id}' is not bootstraped"
-            logger.warn str
+            DevopsLogger.logger.warn str
             1
           end
           status.push r
@@ -171,7 +173,6 @@ module Devops
           files = []
           uri = URI.parse(@request.url)
           h = s.to_hash
-#          h["options"] = s.options
           h["_id"] = s.id
           jid = BootstrapWorker.perform_async(dir, s.provider, h, bt, parser.current_user, DevopsConfig.config)
           Worker.set_status jid, Worker::STATUS::IN_QUEUE