Merge cockroachdb#32404

32404: roachprod: add eu-west-2 AWS zone to roachprod r=m-schneider a=m-schneider Release note: None Co-authored-by: Masha Schneider <[email protected]>
tbg · Nov 16, 2018 · 7f9b9b1 · 7f9b9b1
2 parents eb8345b + b5df3dd
commit 7f9b9b1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/cmd/roachprod/vm/aws/aws.go b/pkg/cmd/roachprod/vm/aws/aws.go
@@ -84,6 +84,7 @@ func (o *providerOpts) ConfigureCreateFlags(flags *pflag.FlagSet) {
 		[]string{
 			"us-east-2:ami-965e6bf3",
 			"us-west-2:ami-79873901",
+			"eu-west-2:ami-941e04f0",
 		},
 		"AMI images for each region")
 
@@ -106,14 +107,18 @@ func (o *providerOpts) ConfigureCreateFlags(flags *pflag.FlagSet) {
 			"us-west-2a:subnet-fc46638b",
 			"us-west-2b:subnet-2910174c",
 			"us-west-2c:subnet-da2a5783",
+			"eu-west-2a:subnet-e98a6c92",
+			"eu-west-2b:subnet-3c754e76",
+			"eu-west-2c:subnet-7733c91e",
 		},
 		"Subnet id for zones in each region")
 
 	// Set up a roachprod security group in each region
 	flags.StringSliceVar(&o.SecurityGroups, ProviderName+"-sg",
 		[]string{
 			"us-east-2:sg-06a4c809644e32920",
-			"us-west-2:sg-00dfe24958e988576"},
+			"us-west-2:sg-00dfe24958e988576",
+			"eu-west-2:sg-057f3842f5cec0576"},
 		"Security group id in each region")
 
 	// AWS images generally use "ubuntu" or "ec2-user"