terraform/examples: Add us-west-2 region as an option for deployments

- us-west-2 region remains mostly free, to reduce vpc-limit exceeded errors in our autotests, we should use us-west-2 region for our autotest deployments. - Added us-west-2 option in keypair_name, availability_zone, host_amis. - The aws_regions block can be overridden in autotest to use us-west-2 region. Change-Id: If71cede98510af98eafe287952bba945e23e5ee6
aristanetworks · Jan 12, 2022 · e9a7d0c · e9a7d0c
1 parent aa9775e
commit e9a7d0c
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 41 deletions.
diff --git a/terraform/examples/aws_novpc/input_vars.tfvars b/terraform/examples/aws_novpc/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-west-1-keypair", #mandatory
-  us-east-1 : "your-east-1-keypair", #mandatory
-  us-east-2 : "your-east-2-keypair", #mandatory
+  us-west-1 : "your-west-1-keypair",
+  us-east-1 : "your-east-1-keypair",
+  us-east-2 : "your-east-2-keypair",
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## CloudEOS network requires three subnets for control plane
@@ -102,13 +104,15 @@ availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
   us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 
 vpc_info = {

diff --git a/terraform/examples/aws_oneregion_multipleleaf/input_vars.tfvars b/terraform/examples/aws_oneregion_multipleleaf/input_vars.tfvars
@@ -11,8 +11,10 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-east-1 : "your-east-1-keypair", #mandatory
+  us-east-1 : "your-east-1-keypair",
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## Cutomization of the parameters below are *optional*
@@ -99,14 +101,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 
 vpc_info = {

diff --git a/terraform/examples/aws_tgw_connect/input_vars.tfvars b/terraform/examples/aws_tgw_connect/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-west-1-keypair",  #mandatory
-  us-east-1 : "your-east-1-keypair",  #mandatory
-  us-east-2 : "your-east-2-keypair",  #mandatory
+  us-west-1 : "your-west-1-keypair",
+  us-east-1 : "your-east-1-keypair",
+  us-east-2 : "your-east-2-keypair",
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## Cutomization of the parameters below are *optional*
@@ -103,14 +105,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 # Topology specific variables
 vpc_info = {

diff --git a/terraform/examples/aws_tgw_multiregion/input_vars.tfvars b/terraform/examples/aws_tgw_multiregion/input_vars.tfvars
@@ -11,9 +11,11 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-east-1 : "your-east-1-keypair", #mandatory
-  us-east-2 : "your-east-1-keypair"
+  us-east-1 : "your-east-1-keypair",
+  us-east-2 : "your-east-1-keypair",
+  us-west-2 : "your-west-2-keypair"
 }
 
 ## Cutomization of the parameters below are *optional*
@@ -101,14 +103,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 vpc_info = {
   region3_edge_vpc =  {

diff --git a/terraform/examples/aws_tworegion_clos/input_vars.tfvars b/terraform/examples/aws_tworegion_clos/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-west-1-keypair",  #mandatory
-  us-east-1 : "your-east-1-keypair",  #mandatory
-  us-east-2 : "your-east-2-keypair",  #mandatory
+  us-west-1 : "your-west-1-keypair",
+  us-east-1 : "your-east-1-keypair",
+  us-east-2 : "your-east-2-keypair", 
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## Cutomization of the parameters below are *optional*
@@ -103,14 +105,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 # Topology specific variables
 vpc_info = {

diff --git a/terraform/examples/aws_tworegion_cloudha/input_vars.tfvars b/terraform/examples/aws_tworegion_cloudha/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-west-1-keypair", #mandatory
-  us-east-1 : "your-east-1-keypair", #mandatory
-  us-east-2 : "your-east-2-keypair", #mandatory
+  us-west-1 : "your-west-1-keypair",
+  us-east-1 : "your-east-1-keypair",
+  us-east-2 : "your-east-2-keypair",
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## AWS IAM profile name that allows CloudEOS router to modify AWS routing tables
@@ -109,14 +111,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 
 # Topology specific variables

diff --git a/terraform/examples/aws_tworegion_noleaf/input_vars.tfvars b/terraform/examples/aws_tworegion_noleaf/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-west-1-keypair",  #mandatory
-  us-east-1 : "your-east-1-keypair",  #mandatory
-  us-east-2 : "your-east-2-keypair",  #mandatory
+  us-west-1 : "your-west-1-keypair",
+  us-east-1 : "your-east-1-keypair", 
+  us-east-2 : "your-east-2-keypair", 
+  us-west-2 : "your-west-2-keypair",
 }
 
 ## Cutomization of the parameters below are *optional*
@@ -103,14 +105,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 # Topology specific variables
 vpc_info = {

diff --git a/terraform/examples/multicloud_tworegion_cloudha/input_vars.tfvars b/terraform/examples/multicloud_tworegion_cloudha/input_vars.tfvars
@@ -11,10 +11,12 @@ cvaas = {
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-keypair", #mandatory
-  us-east-1 : "your-keypair", #mandatory
-  us-east-2 : "your-keypair", #mandatory
+  us-west-1 : "your-keypair",
+  us-east-1 : "your-keypair",
+  us-east-2 : "your-keypair",
+  us-west-2 : "your-keypair"
 }
 
 ## AWS IAM profile name that allows CloudEdge router to modify AWS routing tables
@@ -113,14 +115,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 
 #azure cloudeos info

diff --git a/terraform/examples/multicloud_tworegion_provisionmode/input_vars.tfvars b/terraform/examples/multicloud_tworegion_provisionmode/input_vars.tfvars
@@ -18,10 +18,12 @@ deploy_mode = "provision"
 
 ## Enter keypairs that will be used to login to AWS instances
 ## If you don't have keypairs create them on AWS console for the following regions
+## only keypairs for regions mentioned in aws_regions block is needed
 keypair_name = {
-  us-west-1 : "your-keypair", #mandatory
-  us-east-1 : "your-keypair", #mandatory
-  us-east-2 : "your-keypair", #mandatory
+  us-west-1 : "your-keypair",
+  us-east-1 : "your-keypair",
+  us-east-2 : "your-keypair",
+  us-west-2 : "your-keypair",
 }
 
 ## CloudVision container names - they need to be created on www.arista.io/cv
@@ -120,14 +122,16 @@ eos_byol_amis = {
 availability_zone = {
   us-west-1 : { zone1 : "us-west-1b", zone2 : "us-west-1c" },
   us-east-1 : { zone1 : "us-east-1b", zone2 : "us-east-1c" },
-  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" }
+  us-east-2 : { zone1 : "us-east-2b", zone2 : "us-east-2c" },
+  us-west-2 : { zone1 : "us-west-2b", zone2 : "us-west-2c" }
 }
 
 ## Currently private AMIs. Contact Arista for access
 host_amis = {
   us-west-1 : "ami-035dbbb5f679b91cd",
   us-east-1 : "ami-0b161e951484253ab",
-  us-east-2 : "ami-083064f66d3878ff7"
+  us-east-2 : "ami-083064f66d3878ff7",
+  us-west-2 : "ami-0205b2cab53dacf39"
 }
 
 #azure cloudeos info