projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15107: Fix personFields parameter.
[arvados.git]
/
lib
/
cloud
/
ec2
/
ec2.go
diff --git
a/lib/cloud/ec2/ec2.go
b/lib/cloud/ec2/ec2.go
index 079c32802ca4d3a038b1a395b5d56188b99a7cce..d373d2b718d4bf65c7db7f23ee53a1695f10f45b 100644
(file)
--- a/
lib/cloud/ec2/ec2.go
+++ b/
lib/cloud/ec2/ec2.go
@@
-32,7
+32,7
@@
type ec2InstanceSetConfig struct {
AccessKeyID string
SecretAccessKey string
Region string
AccessKeyID string
SecretAccessKey string
Region string
- SecurityGroupIDs
[]string
+ SecurityGroupIDs
arvados.StringSet
SubnetID string
AdminUsername string
EBSVolumeType string
SubnetID string
AdminUsername string
EBSVolumeType string
@@
-161,6
+161,11
@@
func (instanceSet *ec2InstanceSet) Create(
})
}
})
}
+ var groups []string
+ for sg := range instanceSet.ec2config.SecurityGroupIDs {
+ groups = append(groups, sg)
+ }
+
rii := ec2.RunInstancesInput{
ImageId: aws.String(string(imageID)),
InstanceType: &instanceType.ProviderType,
rii := ec2.RunInstancesInput{
ImageId: aws.String(string(imageID)),
InstanceType: &instanceType.ProviderType,
@@
-173,7
+178,7
@@
func (instanceSet *ec2InstanceSet) Create(
AssociatePublicIpAddress: aws.Bool(false),
DeleteOnTermination: aws.Bool(true),
DeviceIndex: aws.Int64(0),
AssociatePublicIpAddress: aws.Bool(false),
DeleteOnTermination: aws.Bool(true),
DeviceIndex: aws.Int64(0),
- Groups: aws.StringSlice(
instanceSet.ec2config.SecurityGroupID
s),
+ Groups: aws.StringSlice(
group
s),
SubnetId: &instanceSet.ec2config.SubnetID,
}},
DisableApiTermination: aws.Bool(false),
SubnetId: &instanceSet.ec2config.SubnetID,
}},
DisableApiTermination: aws.Bool(false),