From e37e53f307f41df40ea8137928c56d8730bdf1ad Mon Sep 17 00:00:00 2001 From: Lior Goikhburg Date: Fri, 4 Apr 2014 15:19:39 +0400 Subject: [PATCH 1/3] [LIBCLOUD-535] Add EbsOptimized parameter to create_node() method of BaseEC2NodeDriver in ec2.py driver --- libcloud/compute/drivers/ec2.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 4d75fa3..d09e808 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1430,6 +1430,9 @@ class BaseEC2NodeDriver(NodeDriver): else: params['IamInstanceProfile.Name'] = kwargs['ex_iamprofile'] + if 'EbsOptimized' in kwargs: + params['EbsOptimized'] = kwargs['EbsOptimized'] + object = self.connection.request(self.path, params=params).object nodes = self._to_nodes(object, 'instancesSet/item') -- 1.8.3.2 From 4574f81465d9f43fbefd082a768aebdccdb33883 Mon Sep 17 00:00:00 2001 From: Lior Goikhburg Date: Mon, 7 Apr 2014 14:10:48 +0400 Subject: [PATCH 2/3] [LIBCLOUD-535] Fix parameter name add documentation --- libcloud/compute/drivers/ec2.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index d09e808..bac7f8d 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1362,6 +1362,9 @@ class BaseEC2NodeDriver(NodeDriver): :keyword ex_iamprofile: Name or ARN of IAM profile :type ex_iamprofile: ``str`` + + :keyword ex_ebs_optimized: EBS-Optimized if True + :type ex_ebs_optimized: ``bool`` """ image = kwargs["image"] size = kwargs["size"] @@ -1430,8 +1433,8 @@ class BaseEC2NodeDriver(NodeDriver): else: params['IamInstanceProfile.Name'] = kwargs['ex_iamprofile'] - if 'EbsOptimized' in kwargs: - params['EbsOptimized'] = kwargs['EbsOptimized'] + if 'ex_ebs_optimized' in kwargs: + params['EbsOptimized'] = kwargs['ex_ebs_optimized'] object = self.connection.request(self.path, params=params).object nodes = self._to_nodes(object, 'instancesSet/item') -- 1.8.3.2 From b6f603d62e910834437a59fd783a052a26ce4629 Mon Sep 17 00:00:00 2001 From: Lior Goikhburg Date: Fri, 4 Apr 2014 15:19:39 +0400 Subject: [PATCH 3/3] [LIBCLOUD-535] Add EbsOptimized parameter to create_node() method of BaseEC2NodeDriver in ec2.py driver [LIBCLOUD-535] Fix parameter name add documentation --- libcloud/compute/drivers/ec2.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 4d75fa3..bac7f8d 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1362,6 +1362,9 @@ class BaseEC2NodeDriver(NodeDriver): :keyword ex_iamprofile: Name or ARN of IAM profile :type ex_iamprofile: ``str`` + + :keyword ex_ebs_optimized: EBS-Optimized if True + :type ex_ebs_optimized: ``bool`` """ image = kwargs["image"] size = kwargs["size"] @@ -1430,6 +1433,9 @@ class BaseEC2NodeDriver(NodeDriver): else: params['IamInstanceProfile.Name'] = kwargs['ex_iamprofile'] + if 'ex_ebs_optimized' in kwargs: + params['EbsOptimized'] = kwargs['ex_ebs_optimized'] + object = self.connection.request(self.path, params=params).object nodes = self._to_nodes(object, 'instancesSet/item') -- 1.8.3.2