lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.1 vs lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.2

- old
+ new

@@ -60,10 +60,11 @@ driver.default_ami end default_config :username, nil default_config :associate_public_ip, nil default_config :interface, nil + default_config :http_proxy, ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"] required_config :aws_ssh_key_id required_config :image_id def self.validation_warn(driver, old_key, new_key) @@ -248,10 +249,11 @@ @ec2 ||= Aws::Client.new( config[:region], config[:shared_credentials_profile], config[:aws_access_key_id], config[:aws_secret_access_key], - config[:aws_session_token] + config[:aws_session_token], + config[:http_proxy] ) end def instance_generator @instance_generator ||= Aws::InstanceGenerator.new(config, ec2)