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

#840: some small fixes

Browse Source
This commit is contained in:
amartynov 2015-10-26 14:51:25 +03:00
parent 02e4ae88d8
commit 02cf7427cf
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devops-service/workers/bootstrap_worker.rb
View File

@ -10,7 +10,7 @@ class BootstrapWorker < Worker
def perform(options) def perform(options)
provider_name = options.fetch('provider_name') provider_name = options.fetch('provider_name')
server_attrs = options.fetch('server_attrs') server_attrs = options.fetch('server_attrs')
bootstrap_template = options.fetch('bootstrap_template') # bootstrap_template = options.fetch('bootstrap_template')
owner = options.fetch('owner') owner = options.fetch('owner')
options = convert_config(options) options = convert_config(options)
@ -23,9 +23,6 @@ class BootstrapWorker < Worker
bootstrap_template: bootstrap_template bootstrap_template: bootstrap_template
} }
=end =end
out << "\nFrom bootstrap worker: "
out << options.inspect
out << "\n"
executor = Devops::Executor::ServerExecutor.new(server, out) executor = Devops::Executor::ServerExecutor.new(server, out)
executor.report = report executor.report = report
status = executor.two_phase_bootstrap(options) status = executor.two_phase_bootstrap(options)

1
devops-service/workers/worker.rb
View File

@ -133,7 +133,6 @@ class Worker
def convert_config conf def convert_config conf
config = {} config = {}
conf.each {|k,v| config[k.is_a?(String) ? k.to_sym : k] = v} conf.each {|k,v| config[k.is_a?(String) ? k.to_sym : k] = v}
DevopsLogger.logger.info "Converted options: #{config.inspect}"
config config
end end