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

Merge branch 'qa' of /home/git/repositories/cloudtechlab/devops-service into release

Browse Source
This commit is contained in:
Aleksei Melezhik 2015-10-12 19:49:42 +04:00
commit 4c15128b94
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/app/api2/handlers/report.rb
View File

@ -34,7 +34,7 @@ module Devops
r = Devops::Db.connector.report(id) r = Devops::Db.connector.report(id)
file = r.file file = r.file
raise RecordNotFound.new("Report '#{id}' does not exist") unless File.exists? 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 rescue RecordNotFound => e
if status(id) == Worker::STATUS::IN_QUEUE if status(id) == Worker::STATUS::IN_QUEUE
return "Task '#{id}' has been queued", false return "Task '#{id}' has been queued", false

4
devops-service/app/api2/routes/server.rb
View File

@ -364,9 +364,9 @@ module Devops
# #
# * *Returns* : # * *Returns* :
# 200 - Updated # 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") 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") create_response("Run list has been changed")
end end

6
devops-service/db/mongo/models/project.rb
View File

@ -215,9 +215,9 @@ module Devops
roles roles
else else
info = "" info = ""
info += " Project roles '#{roles[:new].join("', '")}' have been automaticaly created" unless roles[:new].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].empty? 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].empty? info += " Project roles '#{roles[:error].join("', '")}' weren't created because of internal error" unless roles[:error].nil?
info info
end end
end end

3
devops-service/workers/stack_bootstrap_worker.rb
View File

@ -80,7 +80,8 @@ class StackBootstrapWorker < Worker
servers.each do |server| servers.each do |server|
executor = Devops::Executor::ServerExecutor.new(server, @out) executor = Devops::Executor::ServerExecutor.new(server, @out)
executor.report = report 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 @out.flush
end end
check_bootstrap_results!(bootstraping_results) check_bootstrap_results!(bootstraping_results)