Repository: libcloud Updated Branches: refs/heads/trunk 2bd37b687 -> 7afbfbb55
Allow nodes to be launched into a specific subnet by adding subnet parameter to create_node() method of ec2 driver Closes #318 Signed-off-by: Tomaz Muraus <to...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7afbfbb5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7afbfbb5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7afbfbb5 Branch: refs/heads/trunk Commit: 7afbfbb55e8d301fb0c62dd03dcf1d117dbb1e4a Parents: 2bd37b6 Author: Lior Goikhburg <goikhb...@gmail.com> Authored: Fri Jun 20 17:27:49 2014 +0400 Committer: Tomaz Muraus <to...@apache.org> Committed: Sun Jun 22 20:12:45 2014 +0200 ---------------------------------------------------------------------- CHANGES.rst | 5 +++++ libcloud/compute/drivers/ec2.py | 6 ++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/7afbfbb5/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index 839a570..a6e6f25 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -243,6 +243,11 @@ Compute (GITHUB-317) [Pablo Orduña] +- Allow user to launch EC2 node in a specific VPC subnet by passing + ``ex_subnet`` argument to the create_node method. + (GITHUB-318) + [Lior Goikhburg] + Storage ~~~~~~~ http://git-wip-us.apache.org/repos/asf/libcloud/blob/7afbfbb5/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index db4ed76..1f86789 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -2047,6 +2047,9 @@ class BaseEC2NodeDriver(NodeDriver): :keyword ex_ebs_optimized: EBS-Optimized if True :type ex_ebs_optimized: ``bool`` + + :keyword ex_subnet: The subnet to launch the instance into. + :type ex_subnet: :class:`.EC2Subnet` """ image = kwargs["image"] size = kwargs["size"] @@ -2118,6 +2121,9 @@ class BaseEC2NodeDriver(NodeDriver): if 'ex_ebs_optimized' in kwargs: params['EbsOptimized'] = kwargs['ex_ebs_optimized'] + if 'ex_subnet' in kwargs: + params['SubnetId'] = kwargs['ex_subnet'].id + object = self.connection.request(self.path, params=params).object nodes = self._to_nodes(object, 'instancesSet/item')
