diff --git a/devops-client/lib/devops-client/handler/stack.rb b/devops-client/lib/devops-client/handler/stack.rb index a4ae3f0..1eabbb6 100644 --- a/devops-client/lib/devops-client/handler/stack.rb +++ b/devops-client/lib/devops-client/handler/stack.rb @@ -46,7 +46,8 @@ class Stack < Handler 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[: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')) q[:parameters] = JSON.parse(File.read(filepath)) diff --git a/devops-client/locales/en.yml b/devops-client/locales/en.yml index e388b8a..71e9aef 100644 --- a/devops-client/locales/en.yml +++ b/devops-client/locales/en.yml @@ -115,7 +115,7 @@ en: id: "Id: " deploy_env: "Deploy env: " parameters_file: "Path to file with JSON parameters: " - run_list: Run list + run_list: "Run list: " question: create: "Are you sure to create stack?" delete: "Are you sure to delete stack '%{name}'?" diff --git a/devops-service/app/api2/handlers/stack.rb b/devops-service/app/api2/handlers/stack.rb index 0ec83c3..70bdc81 100644 --- a/devops-service/app/api2/handlers/stack.rb +++ b/devops-service/app/api2/handlers/stack.rb @@ -39,13 +39,13 @@ module Devops Devops::Db.connector.stack_insert(stack_model) file = JobStarter.start_job(:worker, :stack_bootstrap, - provider: stack.provider, - stack_id: stack.id, + provider: stack_model.provider, + stack_id: stack_model.id, request: @request ) puts "Syncing report is located here: #{file}" - stack + stack_model end def stack id diff --git a/devops-service/app/api2/routes/stack.rb b/devops-service/app/api2/routes/stack.rb index abfe3cb..7202206 100644 --- a/devops-service/app/api2/routes/stack.rb +++ b/devops-service/app/api2/routes/stack.rb @@ -18,7 +18,7 @@ module Devops app.post_with_headers "/stack", :headers => [:accept] do 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 end