Fix proxy support

+ Add proxy configuration parameter to boto clients for all the
  runtime python scripts
+ Add possibility to download a custom node package by a proxy

Signed-off-by: Enrico Usai <[email protected]>

Author: Enrico Usai

files/default/attachVolume.py

@@ -5,6 +5,8 @@
 import urllib2
 import boto3
 import time
+import ConfigParser
+from botocore.config import Config
 
 
 def main():
@@ -34,8 +36,17 @@ def main():
     # List of available block devices after removing currently used block devices
     availableDevices = [a for a in blockDevices if a not in paths]
 
+    # Parse configuration file to read proxy settings
+    config = ConfigParser.RawConfigParser()
+    config.read('/etc/boto.cfg')
+    proxy_config = Config()
+    if config.has_option('Boto', 'proxy') and config.has_option('Boto', 'proxy_port'):
+        proxy = config.get('Boto', 'proxy')
+        proxy_port = config.get('Boto', 'proxy_port')
+        proxy_config = Config(proxies={'https': "{}:{}".format(proxy, proxy_port)})
+
     # Connect to AWS using boto
-    ec2 = boto3.client('ec2', region_name=region)
+    ec2 = boto3.client('ec2', region_name=region, config=proxy_config)
 
     # Attach the volume
     dev = availableDevices[0].replace('xvd', 'sd')

files/default/ec2_dev_2_volid.py

@@ -6,6 +6,8 @@
 import syslog
 import time
 import boto3
+import ConfigParser
+from botocore.config import Config
 
 
 def main():
@@ -35,8 +37,17 @@ def main():
     region = urllib2.urlopen("http://169.254.169.254/latest/meta-data/placement/availability-zone").read()
     region = region[:-1]
 
+    # Parse configuration file to read proxy settings
+    config = ConfigParser.RawConfigParser()
+    config.read('/etc/boto.cfg')
+    proxy_config = Config()
+    if config.has_option('Boto', 'proxy') and config.has_option('Boto', 'proxy_port'):
+        proxy = config.get('Boto', 'proxy')
+        proxy_port = config.get('Boto', 'proxy_port')
+        proxy_config = Config(proxies={'https': "{}:{}".format(proxy, proxy_port)})
+
     # Connect to AWS using boto
-    ec2 = boto3.client('ec2', region_name=region)
+    ec2 = boto3.client('ec2', region_name=region, config=proxy_config)
 
     # Poll for blockdevicemapping
     devices = ec2.describe_instance_attribute(InstanceId=instanceId, Attribute='blockDeviceMapping').get('BlockDeviceMappings')

recipes/base_install.rb

@@ -117,13 +117,16 @@
 # Check whether install a custom cfncluster-node package or the standard one
 if !node['cfncluster']['custom_node_package'].nil? && !node['cfncluster']['custom_node_package'].empty?
   # Install custom cfncluster-node package
-  execute "install cfncluster-node" do
-    command "sudo pip uninstall --yes cfncluster-node &&" \
-      "cd /tmp &&" \
-      "curl -v -L -o /tmp/cfncluster-node.tgz #{node['cfncluster']['custom_node_package']} &&" \
-      "tar -xzf /tmp/cfncluster-node.tgz &&" \
-      "cd /tmp/cfncluster-node-* &&" \
-      "sudo /usr/bin/python setup.py install"
+  bash "install cfncluster-node" do
+    cwd '/tmp'
+    code <<-EOH
+      source /tmp/proxy.sh
+      sudo pip uninstall --yes cfncluster-node
+      curl -v -L -o cfncluster-node.tgz #{node['cfncluster']['custom_node_package']}
+      tar -xzf cfncluster-node.tgz
+      cd cfncluster-node-*
+      sudo /usr/bin/python setup.py install
+    EOH
   end
 else
   # Install cfncluster-node package