Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

m6 & m8 updates #42

Closed
wants to merge 2 commits into from
Closed

m6 & m8 updates #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10025ab
m6 & m8 updates
mistwire Jun 21, 2024
8e69cdd
modify m6 instances and s3
mistwire Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions m6_solution/instances.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ data "aws_ssm_parameter" "ami" {
resource "aws_instance" "nginx1" {
ami = nonsensitive(data.aws_ssm_parameter.ami.value)
instance_type = var.instance_type
subnet_id = aws_subnet.subnet1.id
vpc_security_group_ids = [aws_security_group.nginx-sg.id]
subnet_id = aws_subnet.public_subnet1.id
vpc_security_group_ids = [aws_security_group.nginx_sg.id]
iam_instance_profile = aws_iam_instance_profile.nginx_profile.name
depends_on = [aws_iam_role_policy.allow_s3_all]

Expand All @@ -37,8 +37,8 @@ EOF
resource "aws_instance" "nginx2" {
ami = nonsensitive(data.aws_ssm_parameter.ami.value)
instance_type = var.instance_type
subnet_id = aws_subnet.subnet2.id
vpc_security_group_ids = [aws_security_group.nginx-sg.id]
subnet_id = aws_subnet.public_subnet2.id
vpc_security_group_ids = [aws_security_group.nginx_sg.id]
iam_instance_profile = aws_iam_instance_profile.nginx_profile.name
depends_on = [aws_iam_role_policy.allow_s3_all]

Expand Down
5 changes: 4 additions & 1 deletion m6_solution/s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,7 @@ resource "aws_s3_object" "graphic" {

tags = local.common_tags

}
}

# doesn't match the videos - missing aws_iam_role & aws_iam_role_policy
# (which apparently aren't needed but aren't consistent with video?)
0 m8_solution/modules/globo-web-app-s3/main.tf → m8_solution/modules/globo-webapp-s3/main.tf
View file
Open in desktop
File renamed without changes.
0 ...ution/modules/globo-web-app-s3/outputs.tf → ...lution/modules/globo-webapp-s3/outputs.tf
View file
Open in desktop
File renamed without changes.
0 ...ion/modules/globo-web-app-s3/terraform.tf → ...tion/modules/globo-webapp-s3/terraform.tf
View file
Open in desktop
File renamed without changes.
0 ...ion/modules/globo-web-app-s3/variables.tf → ...tion/modules/globo-webapp-s3/variables.tf
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions m8_solution/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ module "app" {
# Assumes 8 bits to be added to the CIDR range for the VPC
public_subnets = [for subnet in range(var.vpc_public_subnet_count) : cidrsubnet(var.vpc_cidr_block, 8, subnet)]

enable_nat_gateway = false
enable_vpn_gateway = false
enable_nat_gateway = false
enable_vpn_gateway = false
map_public_ip_on_launch = var.map_public_ip_on_launch
enable_dns_hostnames = var.enable_dns_hostnames
enable_dns_hostnames = var.enable_dns_hostnames

tags = merge(local.common_tags, {
Name = "${local.naming_prefix}-vpc"
Expand Down