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

CID-422: fix env adding and add possibility to set stack_template

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-03-30 14:07:31 +03:00
parent 0f4dd8a5f3
commit 89c73ef895
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devops-client/lib/devops-client/handler/deploy_envs/deploy_env_ec2.rb
View File

@ -16,6 +16,7 @@ class DeployEnvEc2 < DeployEnv
def fill obj def fill obj
super(obj) do |o| super(obj) do |o|
set_stack_template(o)
set_flavor(o) set_flavor(o)
set_image(o) set_image(o)
vpc_id = set_subnets(o) vpc_id = set_subnets(o)
@ -55,4 +56,12 @@ class DeployEnvEc2 < DeployEnv
end end
end end
def set_stack_template(d)
if question(I18n.t("handler.project.question.set_stack_template"))
set_parameter d, :stack_template do
resources_selector.select_available_stack_template(provider: 'ec2')
end
end
end
end end

12
devops-client/lib/devops-client/handler/project.rb
View File

@ -305,13 +305,17 @@ protected
project = get_project_info_obj(project_name) project = get_project_info_obj(project_name)
puts_warn I18n.t("handler.project.exist", :project => project_name) puts_warn I18n.t("handler.project.exist", :project => project_name)
names = project["deploy_envs"].map{|de| de["identifier"]} names = project["deploy_envs"].map{|de| de["identifier"]}
new_envs = []
while question(I18n.t("handler.project.question.add_env")) while question(I18n.t("handler.project.question.add_env"))
d = method(env_method_name).call(project_name, providers, names) new_envs << method(env_method_name).call(project_name, providers, names)
project["deploy_envs"].push d
break if self.options[:no_ask] break if self.options[:no_ask]
end end
puts json = JSON.pretty_generate(project) puts JSON.pretty_generate(new_envs)
update_object_from_json("project", project_name, json) if question(I18n.t("handler.project.question.update")) if question(I18n.t("handler.project.question.update_with_new_envs"))
new_envs.each do |env|
post "/project/#{project_name}/deploy_env", env
end
end
rescue NotFound => e rescue NotFound => e
project = create_project_cmd(project_name, providers, env_method_name) project = create_project_cmd(project_name, providers, env_method_name)
project[:name] = args[2] project[:name] = args[2]

2
devops-client/locales/en.yml
View File

@ -73,6 +73,8 @@ en:
create: "Create project?" create: "Create project?"
update: "Update project?" update: "Update project?"
add_env: "Add environment?" add_env: "Add environment?"
update_with_new_envs: "Add these envs to project?"
set_stack_template: "Set stack template?"
parameter: parameter:
run_list: run_list:
empty: "WARN: run list is empty, continue?" empty: "WARN: run list is empty, continue?"