| Index: third_party/boto/boto/ec2/address.py
|
| ===================================================================
|
| --- third_party/boto/boto/ec2/address.py (revision 33376)
|
| +++ third_party/boto/boto/ec2/address.py (working copy)
|
| @@ -89,14 +89,23 @@
|
|
|
| delete = release
|
|
|
| - def associate(self, instance_id, dry_run=False):
|
| + def associate(self, instance_id, allow_reassociation=False, dry_run=False):
|
| """
|
| Associate this Elastic IP address with a currently running instance.
|
| :see: :meth:`boto.ec2.connection.EC2Connection.associate_address`
|
| """
|
| + if self.allocation_id:
|
| + return self.connection.associate_address(
|
| + instance_id,
|
| + self.public_ip,
|
| + allocation_id=self.allocation_id,
|
| + allow_reassociation=allow_reassociation,
|
| + dry_run=dry_run
|
| + )
|
| return self.connection.associate_address(
|
| instance_id,
|
| self.public_ip,
|
| + allow_reassociation=allow_reassociation,
|
| dry_run=dry_run
|
| )
|
|
|
|
|