Merge pull request #1799 from anarcher/develop

Added launch_config's parameter associate_ip_address for VPC. Fixes #1799.
boto · Oct 22, 2013 · 6685adb · 6685adb
2 parents 7e6f98d + 24db755
commit 6685adb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/boto/ec2/autoscale/__init__.py b/boto/ec2/autoscale/__init__.py
@@ -241,6 +241,10 @@ def create_launch_configuration(self, launch_config):
             params['EbsOptimized'] = 'true'
         else:
             params['EbsOptimized'] = 'false'
+        if launch_config.associate_public_ip_address is True:
+            params['AssociatePublicIpAddress'] = 'true'
+        elif launch_config.associate_public_ip_address is False:
+            params['AssociatePublicIpAddress'] = 'false'
         return self.get_object('CreateLaunchConfiguration', params,
                                Request, verb='POST')
 

diff --git a/boto/ec2/autoscale/launchconfig.py b/boto/ec2/autoscale/launchconfig.py
@@ -94,7 +94,8 @@ def __init__(self, connection=None, name=None, image_id=None,
                  instance_type='m1.small', kernel_id=None,
                  ramdisk_id=None, block_device_mappings=None,
                  instance_monitoring=False, spot_price=None,
-                 instance_profile_name=None, ebs_optimized=False):
+                 instance_profile_name=None, ebs_optimized=False,
+                 associate_public_ip_address=None):
         """
         A launch configuration.
 
@@ -144,6 +145,10 @@ def __init__(self, connection=None, name=None, image_id=None,
         :type ebs_optimized: bool
         :param ebs_optimized: Specifies whether the instance is optimized
             for EBS I/O (true) or not (false).
+
+        :type associate_public_ip_address: bool
+        :param associate_public_ip_address: Used for Auto Scaling groups that launch instances into an Amazon Virtual Private Cloud. 
+            Specifies whether to assign a public IP address to each instance launched in a Amazon VPC.
         """
         self.connection = connection
         self.name = name
@@ -163,6 +168,7 @@ def __init__(self, connection=None, name=None, image_id=None,
         self.instance_profile_name = instance_profile_name
         self.launch_configuration_arn = None
         self.ebs_optimized = ebs_optimized
+        self.associate_public_ip_address = associate_public_ip_address
 
     def __repr__(self):
         return 'LaunchConfiguration:%s' % self.name

diff --git a/tests/unit/ec2/autoscale/test_group.py b/tests/unit/ec2/autoscale/test_group.py
@@ -227,7 +227,8 @@ def test_launch_config(self):
                 instance_type = 'm1.large',
                 security_groups = ['group1', 'group2'],
                 spot_price='price',
-                block_device_mappings = [bdm]
+                block_device_mappings = [bdm],
+                associate_public_ip_address = True
                 )
 
         response = self.service_connection.create_launch_configuration(lc)
@@ -248,6 +249,7 @@ def test_launch_config(self):
             'SecurityGroups.member.1': 'group1',
             'SecurityGroups.member.2': 'group2',
             'SpotPrice': 'price',
+            'AssociatePublicIpAddress' : 'true'
         }, ignore_params_values=['Version'])