From 2c3d9b99c562681ce2bfe286ba0c06d638cd160e Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 9 Oct 2015 14:09:37 +0300 Subject: [PATCH 1/5] fixed roles response --- devops-service/db/mongo/models/project.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devops-service/db/mongo/models/project.rb b/devops-service/db/mongo/models/project.rb index f8a51e7..48f99b6 100644 --- a/devops-service/db/mongo/models/project.rb +++ b/devops-service/db/mongo/models/project.rb @@ -215,9 +215,9 @@ module Devops roles else info = "" - info += " Project roles '#{roles[:new].join("', '")}' have been automaticaly created" unless roles[:new].empty? - info += " Project roles '#{roles[:exist].join("', '")}' weren't created because they exist" unless roles[:exist].empty? - info += " Project roles '#{roles[:error].join("', '")}' weren't created because of internal error" unless roles[:error].empty? + info += " Project roles '#{roles[:new].join("', '")}' have been automaticaly created" unless roles[:new].nil? + info += " Project roles '#{roles[:exist].join("', '")}' weren't created because they exist" unless roles[:exist].nil? + info += " Project roles '#{roles[:error].join("', '")}' weren't created because of internal error" unless roles[:error].nil? info end end From b984d128f0161a3ed73553ac4fe958ee8825770b Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 9 Oct 2015 15:02:20 +0300 Subject: [PATCH 2/5] fixed method name --- devops-service/app/api2/routes/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-service/app/api2/routes/server.rb b/devops-service/app/api2/routes/server.rb index b06b610..e448a0a 100644 --- a/devops-service/app/api2/routes/server.rb +++ b/devops-service/app/api2/routes/server.rb @@ -366,7 +366,7 @@ module Devops # 200 - Updated app.patch_with_headers "/server/:id/run_list", :headers => [:accept, :content_type] do |node_name| check_privileges("server", "w") - Devops::API2_0::Handler::Server.new(request).set_server_run_list(node_name) + Devops::API2_0::Handler::Server.new(request).set_run_list(node_name) create_response("Run list has been changed") end From 753aeaf281d5d379279e21539df41eaf58446a74 Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 9 Oct 2015 15:08:39 +0300 Subject: [PATCH 3/5] patch -> put --- devops-service/app/api2/routes/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-service/app/api2/routes/server.rb b/devops-service/app/api2/routes/server.rb index e448a0a..d50ba0e 100644 --- a/devops-service/app/api2/routes/server.rb +++ b/devops-service/app/api2/routes/server.rb @@ -364,7 +364,7 @@ module Devops # # * *Returns* : # 200 - Updated - app.patch_with_headers "/server/:id/run_list", :headers => [:accept, :content_type] do |node_name| + app.put_with_headers "/server/:id/run_list", :headers => [:accept, :content_type] do |node_name| check_privileges("server", "w") Devops::API2_0::Handler::Server.new(request).set_run_list(node_name) create_response("Run list has been changed") From 86aaaaf1b8eba7fb23f035c7be7f9f7bae08c506 Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 9 Oct 2015 16:27:47 +0300 Subject: [PATCH 4/5] #824: fixed. Added encoding with replace invalid symbols --- devops-service/app/api2/handlers/report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-service/app/api2/handlers/report.rb b/devops-service/app/api2/handlers/report.rb index 8121c2c..ec10eea 100644 --- a/devops-service/app/api2/handlers/report.rb +++ b/devops-service/app/api2/handlers/report.rb @@ -34,7 +34,7 @@ module Devops r = Devops::Db.connector.report(id) file = r.file raise RecordNotFound.new("Report '#{id}' does not exist") unless File.exists? file - return Rack::Utils.escape_html(File.read(file)), completed?(id) + return Rack::Utils.escape_html(File.read(file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')), completed?(id) rescue RecordNotFound => e if status(id) == Worker::STATUS::IN_QUEUE return "Task '#{id}' has been queued", false From 8ae5fa635e2a641200b3e203959322f24c7e9c92 Mon Sep 17 00:00:00 2001 From: amartynov Date: Mon, 12 Oct 2015 11:58:24 +0300 Subject: [PATCH 5/5] #824: added bootstrap template to stack servers bootstrap command --- devops-service/workers/stack_bootstrap_worker.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb index 253ba3a..780606a 100644 --- a/devops-service/workers/stack_bootstrap_worker.rb +++ b/devops-service/workers/stack_bootstrap_worker.rb @@ -80,7 +80,8 @@ class StackBootstrapWorker < Worker servers.each do |server| executor = Devops::Executor::ServerExecutor.new(server, @out) executor.report = report - bootstraping_results[server.chef_node_name] = executor.two_phase_bootstrap({}) + #TODO: can stack choose bootstrap template? + bootstraping_results[server.chef_node_name] = executor.two_phase_bootstrap({bootstrap_template: 'omnibus'}) @out.flush end check_bootstrap_results!(bootstraping_results)