fix some errors

This commit is contained in:
Anton Chuchkalov 2015-08-05 16:28:12 +03:00
parent 662dbfa48b
commit 579525f15d
4 changed files with 7 additions and 6 deletions

View File

@ -46,7 +46,8 @@ class Stack < Handler
q[:project] = options[:project] || resources_selector.select_available_project q[:project] = options[:project] || resources_selector.select_available_project
q[:deploy_env] = options[:deploy_env] || enter_parameter(I18n.t('handler.stack.create.deploy_env')) q[:deploy_env] = options[:deploy_env] || enter_parameter(I18n.t('handler.stack.create.deploy_env'))
q[:stack_template] = options[:stack_template] || resources_selector.select_available_stack_template(provider: q[:provider]) q[:stack_template] = options[:stack_template] || resources_selector.select_available_stack_template(provider: q[:provider])
q[:run_list] = options[:run_list] || enter_parameter(I18n.t('handler.stack.create.run_list')) q[:run_list] = options[:run_list] || enter_parameter_or_empty(I18n.t('handler.stack.create.run_list'))
q[:run_list] = q[:run_list].split(',')
filepath = options[:parameters_file] || enter_parameter(I18n.t('handler.stack.create.parameters_file')) filepath = options[:parameters_file] || enter_parameter(I18n.t('handler.stack.create.parameters_file'))
q[:parameters] = JSON.parse(File.read(filepath)) q[:parameters] = JSON.parse(File.read(filepath))

View File

@ -115,7 +115,7 @@ en:
id: "Id: " id: "Id: "
deploy_env: "Deploy env: " deploy_env: "Deploy env: "
parameters_file: "Path to file with JSON parameters: " parameters_file: "Path to file with JSON parameters: "
run_list: Run list run_list: "Run list: "
question: question:
create: "Are you sure to create stack?" create: "Are you sure to create stack?"
delete: "Are you sure to delete stack '%{name}'?" delete: "Are you sure to delete stack '%{name}'?"

View File

@ -39,13 +39,13 @@ module Devops
Devops::Db.connector.stack_insert(stack_model) Devops::Db.connector.stack_insert(stack_model)
file = JobStarter.start_job(:worker, :stack_bootstrap, file = JobStarter.start_job(:worker, :stack_bootstrap,
provider: stack.provider, provider: stack_model.provider,
stack_id: stack.id, stack_id: stack_model.id,
request: @request request: @request
) )
puts "Syncing report is located here: #{file}" puts "Syncing report is located here: #{file}"
stack stack_model
end end
def stack id def stack id

View File

@ -18,7 +18,7 @@ module Devops
app.post_with_headers "/stack", :headers => [:accept] do app.post_with_headers "/stack", :headers => [:accept] do
check_privileges("stack", "w") check_privileges("stack", "w")
m = Devops::API2_0::Handler::Stack.new(request).create_stack object m = Devops::API2_0::Handler::Stack.new(request).create_stack
create_response "Created", m.to_hash, 201 create_response "Created", m.to_hash, 201
end end