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

Merge branch 'storing_templates_in_s3' into features

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-01-13 14:57:29 +03:00
commit cb520d0128
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/db/mongo/models/stack_template/stack_template_ec2.rb
View File

@ -36,7 +36,7 @@ module Devops
def generate_template_file_and_upload_to_storage(id, json) def generate_template_file_and_upload_to_storage(id, json)
uniq_filename = "#{id}-#{SecureRandom.hex}.template" uniq_filename = "#{id}-#{SecureRandom.hex}.template"
provider_instance.store_file(uniq_filename, json)['url'] provider_instance.store_stack_template(uniq_filename, json)['url']
end end
end end

10
devops-service/providers/ec2.rb
View File

@ -322,11 +322,13 @@ module Provider
self.compute.describe_vpcs.body["vpcSet"].select{|v| v["state"] == "available"}.map{|v| {"vpc_id" => v["vpcId"], "cidr" => v["cidrBlock"] } } self.compute.describe_vpcs.body["vpcSet"].select{|v| v["state"] == "available"}.map{|v| {"vpc_id" => v["vpcId"], "cidr" => v["cidrBlock"] } }
end end
# use public_url for a while because there is no possibility to create def store_stack_template(filename, json)
# non expiring private links via fog store_file(stack_templates_bucket, filename, json)
def store_file(filename, json) end
def store_file(bucket, filename, body)
{ {
'url' => stack_templates_bucket.files.create(key: filename, body: json, public: true).public_url 'url' => bucket.files.create(key: filename, body: body, public: true).public_url
} }
end end