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

fixed aws proxy

Browse Source
This commit is contained in:
amartynov 2015-08-07 12:03:01 +03:00
parent 4cf2730772
commit 95c467dd4a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,12 @@ module Provider
:aws_access_key_id => config[:aws_access_key_id], :aws_access_key_id => config[:aws_access_key_id],
:aws_secret_access_key => config[:aws_secret_access_key] :aws_secret_access_key => config[:aws_secret_access_key]
} }
options[:proxy] = config[:aws_proxy] if config[:aws_proxy] if config[:aws_proxy] and config[:aws_no_proxy]
options[:no_proxy] = config[:no_proxy] if config[:no_proxy] options[:connection_options] = {
:proxy => config[:aws_proxy],
:no_proxy => config[:no_proxy]
}
end
self.connection_options = options self.connection_options = options
self.availability_zone = config[:aws_availability_zone] || "us-east-1a" self.availability_zone = config[:aws_availability_zone] || "us-east-1a"
self.run_list = config[:aws_integration_run_list] || [] self.run_list = config[:aws_integration_run_list] || []