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

update client to changes in server

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-08-28 14:42:31 +03:00
parent 0f2698f587
commit b22045a278
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devops-client/lib/devops-client/handler/stack.rb
View File

@ -42,12 +42,11 @@ class Stack < Handler
q = {} q = {}
q[:provider] = options[:provider] || resources_selector.select_available_provider q[:provider] = options[:provider] || resources_selector.select_available_provider
q[:id] = options[:id] || enter_parameter(I18n.t('handler.stack.create.id')) # q[:id] = options[:id] || enter_parameter(I18n.t('handler.stack.create.id'))
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[:run_list] = options[:run_list] || enter_parameter_or_empty(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(',')
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))

6
devops-client/lib/devops-client/output/stack.rb
View File

@ -16,7 +16,7 @@ module Output
headers, rows = create_list headers, rows = create_list
else else
puts 'Details are not displayed in table view' puts 'Details are not displayed in table view'
title = I18n.t("output.title.stack.show", id: @data["id"]) title = I18n.t("output.title.stack.show", id: @data["name"])
headers, rows = create_show headers, rows = create_show
end end
end end
@ -37,14 +37,14 @@ module Output
def create_list def create_list
abort(I18n.t("output.not_found.stack.list")) if @data.empty? abort(I18n.t("output.not_found.stack.list")) if @data.empty?
fields_to_output = %w(id project deploy_env stack_template stack_status) fields_to_output = %w(name project deploy_env stack_template stack_status)
fields_to_output << 'provider' unless provider_given? fields_to_output << 'provider' unless provider_given?
headers_and_rows(@data, fields_to_output) headers_and_rows(@data, fields_to_output)
end end
def create_show def create_show
headers_and_rows([@data], %w(id project deploy_env stack_template stack_status)) headers_and_rows([@data], %w(name project deploy_env stack_template stack_status))
end end
def create_servers_list def create_servers_list