From 6de45c41f410a5aeae6f6198aeb2f46cc1fa2ae7 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 12 May 2014 17:29:37 +0200
Subject: [PATCH] Feature #2887: Support a proxy configuration option for the
 AWS hybrid cloud

---
 src/vmm_mad/remotes/ec2/ec2_driver.conf | 1 +
 src/vmm_mad/remotes/ec2/ec2_driver.rb   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.conf b/src/vmm_mad/remotes/ec2/ec2_driver.conf
index 3b11de4df7..461447a4c1 100644
--- a/src/vmm_mad/remotes/ec2/ec2_driver.conf
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.conf
@@ -1,3 +1,4 @@
+proxy_uri:
 regions:
     default:
         region_name: us-east-1
diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index b5ab2f5d5e..5fe1752b4b 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -222,6 +222,10 @@ class EC2Driver
             'secret_access_key' => @region['secret_access_key'],
             'region'            => @region['region_name'])
 
+        if (proxy_uri = public_cloud_ec2_conf['proxy_uri'])
+            AWS.config(:proxy_uri => proxy_uri)
+        end
+
         @ec2 = AWS.ec2
     end