Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added VPC support to EC2 ComputeService

This commit is contained in:
Lili Nader 2010-06-23 15:39:55 -04:00
parent 4bc6434234
commit 23179f03c1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java
View File

@ -73,13 +73,19 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions {
"unexpected image type. should be EC2Size, was: " + template.getSize().getClass()); "unexpected image type. should be EC2Size, was: " + template.getSize().getClass());
EC2Size ec2Size = EC2Size.class.cast(template.getSize()); EC2Size ec2Size = EC2Size.class.cast(template.getSize());
RunInstancesOptions instanceOptions = asType(ec2Size.getInstanceType()).withAdditionalInfo(tag);
String keyPairName = createNewKeyPairUnlessUserSpecifiedOtherwise(region, tag, template String keyPairName = createNewKeyPairUnlessUserSpecifiedOtherwise(region, tag, template
.getOptions()); .getOptions());
Set<String> groups = getSecurityGroupsForTagAndOptions(region, tag, template.getOptions());
RunInstancesOptions instanceOptions = asType(ec2Size.getInstanceType())// String subnetId = template.getOptions().as(EC2TemplateOptions.class).getSubnetId();
.withSecurityGroups(groups)// if(subnetId != null)
.withAdditionalInfo(tag); instanceOptions.withSubnetId(subnetId);
else {
Set<String> groups = getSecurityGroupsForTagAndOptions(region, tag, template.getOptions());
instanceOptions.withSecurityGroups(groups);
}
if (keyPairName != null) if (keyPairName != null)
instanceOptions.withKeyName(keyPairName); instanceOptions.withKeyName(keyPairName);