Merge pull request #9 from Keysight/cloud

Cloud

Author: danfrancu

.gitignore

@@ -1,4 +1,6 @@
 **/.terraform
 *.tfstate*
 *.lock.hcl
-terraform.auto.tfvars
+terraform.auto.tfvars
+.sshkey.pem
+Makefile

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/README.md

@@ -5,15 +5,16 @@ This deployment creates a topology with a single virtual private cloud having a
 
 ## Optional Variables
 ```
+terraform.aws.auto.tfvars
 terraform.optional.auto.tfvars
 ```
-You **MAY** uncomment one or more lines as needed in this file and replace values to match your particular environment.
+You **MAY** uncomment one or more lines as needed in these files and replace values to match your particular environment.
 
 ## Required Usage
 ```
 terraform init
 terraform apply -auto-approve
-terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > SshKey.pem
+terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshKey.pem
 terraform destroy -auto-approve
 ```
 You **MUST** output the SSH key pair associated with the AWS instances.  

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/data.tf

@@ -7,5 +7,5 @@ data "aws_availability_zones" "available" {
 }
 
 data "http" "ip" {
-	url = "https://ifconfig.me"
+	url = "https://ifconfig.me/ip"
 }

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/main.tf

@@ -1,5 +1,5 @@
 module "App" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-app.git?ref=10.40.1"
+	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-app.git?ref=11.0.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	InstanceType = local.AppInstanceType
@@ -13,7 +13,7 @@ module "App" {
 }
 
 module "Agent1" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=10.40.1"
+	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=11.0.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	Eth1SecurityGroupId = module.Vpc.PrivateSecurityGroup.id

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/terraform.aws.auto.tfvars

@@ -0,0 +1,2 @@
+# AwsAccessCredentialsAccessKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+# AwsAccessCredentialsSecretKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/terraform.optional.auto.tfvars

@@ -1,8 +1,6 @@
 # AgentInstanceType = "c5n.xlarge"
 # ApiMaxRetries = 1
 # AppInstanceType = "t3.xlarge"
-# AwsAccessCredentialsAccessKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-# AwsAccessCredentialsSecretKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
 # InboundIPv4CidrBlocks = [ "1.1.1.1/32" ]
 # PrivateSubnetAvailabilityZone = "us-east-1a"
 # PublicSubnetAvailabilityZone = "us-east-1a"

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-1-Agent-1-VPC-1-Public-Subnet-1-Private-Subnet/vpc.tf

@@ -1,5 +1,5 @@
 module "Vpc" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-1-vpc-1-public-subnet-1-private-subnet.git?ref=10.40.0"
+	source = "git::https://github.com/armdupre/terraform-aws-module-1-vpc-1-public-subnet-1-private-subnet.git?ref=11.0.0"
 	InboundIPv4CidrBlocks = local.InboundIPv4CidrBlocks
 	PrivateSubnetAvailabilityZone = local.PrivateSubnetAvailabilityZone
 	PublicSubnetAvailabilityZone = local.PublicSubnetAvailabilityZone

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-2-Agents-1-VPC-1-Public-Subnet-1-Private-Subnet/README.md

@@ -5,15 +5,16 @@ This deployment creates a topology with a single virtual private cloud having a
 
 ## Optional Variables
 ```
+terraform.aws.auto.tfvars
 terraform.optional.auto.tfvars
 ```
-You **MAY** uncomment one or more lines as needed in this file and replace values to match your particular environment.
+You **MAY** uncomment one or more lines as needed in these files and replace values to match your particular environment.
 
 ## Required Usage
 ```
 terraform init
 terraform apply -auto-approve
-terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > SshKey.pem
+terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshKey.pem
 terraform destroy -auto-approve
 ```
 You **MUST** output the SSH key pair associated with the AWS instances.  

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-2-Agents-1-VPC-1-Public-Subnet-1-Private-Subnet/data.tf

@@ -7,5 +7,5 @@ data "aws_availability_zones" "available" {
 }
 
 data "http" "ip" {
-	url = "https://ifconfig.me"
+	url = "https://ifconfig.me/ip"
 }

aws/Deployment/Terraform/IxNetwork/IxNetwork-on-AWS-1-App-2-Agents-1-VPC-1-Public-Subnet-1-Private-Subnet/main.tf

@@ -1,5 +1,5 @@
 module "App" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-app.git?ref=10.40.1"
+	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-app.git?ref=11.0.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	InstanceType = local.AppInstanceType
@@ -13,7 +13,7 @@ module "App" {
 }
 
 module "Agent1" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=10.40.1"
+	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=11.0.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	Eth1SecurityGroupId = module.Vpc.PrivateSecurityGroup.id
@@ -31,7 +31,7 @@ module "Agent1" {
 }
 
 module "Agent2" {
-	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=10.40.1"
+	source = "git::https://github.com/armdupre/terraform-aws-module-ixnetwork-agent.git?ref=11.0.0"
 	Eth0PrivateIpAddress = local.Agent2Eth0PrivateIpAddress
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id