diff --git a/01_05_base/main.tf b/01_05_base/main.tf index e8f85d8..7e9f8c7 100644 --- a/01_05_base/main.tf +++ b/01_05_base/main.tf @@ -10,7 +10,7 @@ variable "ssh_key_name" {} variable "private_key_path" {} variable "region" { - default = "us-east-2" + default = "us-east-1" } variable "vpc_cidr" { diff --git a/02_01_variables/main.tf b/02_01_variables/main.tf index ff9d644..2168d73 100644 --- a/02_01_variables/main.tf +++ b/02_01_variables/main.tf @@ -64,6 +64,10 @@ variable "environment_instance_settings" { } } +variable "deploy_environment" { + default = "DEV" +} + # ////////////////////////////// # PROVIDERS # ////////////////////////////// @@ -141,14 +145,14 @@ resource "aws_security_group" "sg-nodejs-instance" { # INSTANCE resource "aws_instance" "nodejs1" { ami = data.aws_ami.aws-linux.id - instance_type = var.environment_instance_type["DEV"] + instance_type = var.environment_instance_type[var.deploy_environment] //instance_type = var.environment_instance_settings["PROD"].instance_type subnet_id = aws_subnet.subnet1.id vpc_security_group_ids = [aws_security_group.sg-nodejs-instance.id] - monitoring = var.environment_instance_settings["PROD"].monitoring + monitoring = var.environment_instance_settings[var.deploy_environment].monitoring - tags = {Environment = var.environment_list[0]} + tags = {Environment = var.environment_map[var.deploy_environment]} } diff --git a/02_02-07_variables/main.tf b/02_02-07_variables/main.tf index e2bea6c..56395b0 100644 --- a/02_02-07_variables/main.tf +++ b/02_02-07_variables/main.tf @@ -182,4 +182,8 @@ data "aws_ami" "aws-linux" { # ////////////////////////////// output "instance-dns" { value = aws_instance.nodejs1.public_dns +} + +output "private-dns" { + value = aws.instance.nodejs1.private_dns } \ No newline at end of file diff --git a/02_10_count/main.tf b/02_10_count/main.tf index f96932b..91cc584 100644 --- a/02_10_count/main.tf +++ b/02_10_count/main.tf @@ -143,8 +143,8 @@ resource "aws_security_group" "sg-nodejs-instance" { } # INSTANCE -resource "aws_instance" "nodejs1" { - //count = 4 +resource "aws_instance" "node_instances" { + count = 4 ami = data.aws_ami.aws-linux.id instance_type = var.environment_instance_settings["PROD"].instance_type @@ -156,6 +156,12 @@ resource "aws_instance" "nodejs1" { tags = {Environment = var.environment_list[0]} } +resource "aws_iam_user" "iam-users" { + for_each = var.iam_accounts + + name = each.key +} + # ////////////////////////////// # DATA @@ -186,5 +192,5 @@ data "aws_ami" "aws-linux" { # OUTPUT # ////////////////////////////// output "instance-dns" { - value = aws_instance.nodejs1.public_dns + value = aws_instance.node_instances.*.public_dns } \ No newline at end of file diff --git a/04_04_terraform_cloud_cli/backend.tf b/04_04_terraform_cloud_cli/backend.tf index 1119b39..c58deea 100644 --- a/04_04_terraform_cloud_cli/backend.tf +++ b/04_04_terraform_cloud_cli/backend.tf @@ -1,6 +1,6 @@ terraform { backend "remote" { - organization = "red30" + organization = "kasunn25" workspaces { name = "cli-workspace" diff --git a/04_05_terraform_cloud_vcs/variables.tf b/04_05_terraform_cloud_vcs/variables.tf index 06a0e24..003d79d 100644 --- a/04_05_terraform_cloud_vcs/variables.tf +++ b/04_05_terraform_cloud_vcs/variables.tf @@ -17,7 +17,7 @@ variable "instance_count" { variable "instance_tags" { type = map default = { - "environment" = "dev" + "environment" = "staging" } } # //////////////////////////////