From 22430159147dcd80cb6570e4c4498014be611c3a Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 17 Jul 2015 15:15:52 +0300 Subject: [PATCH] add project and deploy_env params to stack template client handler --- devops-client/lib/devops-client/handler/stack_preset.rb | 3 ++- .../lib/devops-client/options/stack_preset_options.rb | 2 ++ devops-service/db/mongo/models/stack/stack_base.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devops-client/lib/devops-client/handler/stack_preset.rb b/devops-client/lib/devops-client/handler/stack_preset.rb index a6df6d9..b1e9073 100644 --- a/devops-client/lib/devops-client/handler/stack_preset.rb +++ b/devops-client/lib/devops-client/handler/stack_preset.rb @@ -22,6 +22,7 @@ class StackPreset < Handler output when :apply apply_handler + output end end @@ -55,7 +56,7 @@ class StackPreset < Handler filepath = options[:parameters_file] || enter_parameter(I18n.t('handler.stack_preset.create.parameters_file')) params[:parameters] = JSON.parse(File.read(filepath)) - result = post_body("/stack_presets/#{params[:id]}/apply", JSON.pretty_generate(params)) + @list = post_body("/stack_presets/#{params[:id]}/apply", JSON.pretty_generate(params)) end end diff --git a/devops-client/lib/devops-client/options/stack_preset_options.rb b/devops-client/lib/devops-client/options/stack_preset_options.rb index 919e2dc..0c8fde4 100644 --- a/devops-client/lib/devops-client/options/stack_preset_options.rb +++ b/devops-client/lib/devops-client/options/stack_preset_options.rb @@ -18,6 +18,8 @@ class StackPresetOptions < CommonOptions parser.banner << self.apply_banner parser.recognize_option_value(:provider, 'stack_preset') + parser.recognize_option_value(:project, 'stack_preset') + parser.recognize_option_value(:deploy_env, 'stack_preset') parser.recognize_option_value(:stack, 'stack_preset') parser.recognize_option_value(:parameters_file, 'stack_preset') end diff --git a/devops-service/db/mongo/models/stack/stack_base.rb b/devops-service/db/mongo/models/stack/stack_base.rb index 695331f..ac7410f 100644 --- a/devops-service/db/mongo/models/stack/stack_base.rb +++ b/devops-service/db/mongo/models/stack/stack_base.rb @@ -11,7 +11,7 @@ module Devops deploy_env: {type: String}, stack_template: {type: String, empty: false}, cloud_stack_id: {type: String, nil: true} - # details: {type: String, nil: true} + # details: {type: Hash, nil: true} # Hash type isn't supported yet def initialize attrs={} self.provider = self.class.provider