Skip to content

Commit a0300e2

Browse files
committed
Remove unnecessary code now that an AMI is used
1 parent 0ca74da commit a0300e2

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

server/main.tf

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ami" {
22
description = "Base machine image for running this server"
3-
default = "ami-bd8f33c5"
3+
default = "ami-e70db29f"
44
}
55

66
variable "num_webs" {
@@ -12,13 +12,8 @@ variable "identity" {
1212
description = "A unique name for this server"
1313
}
1414

15-
resource "aws_key_pair" "training" {
16-
key_name = "${var.identity}-key"
17-
public_key = "${file("~/.ssh/id_rsa.pub")}"
18-
}
19-
20-
resource "aws_security_group" "instance" {
21-
name = "${var.identity}-terraform-example-instance"
15+
resource "aws_security_group" "web" {
16+
name = "${var.identity}-sg"
2217

2318
ingress {
2419
from_port = 80
@@ -56,31 +51,13 @@ resource "aws_instance" "web" {
5651
instance_type = "t2.medium"
5752
count = "${var.num_webs}"
5853

59-
vpc_security_group_ids = ["${aws_security_group.instance.id}"]
60-
61-
key_name = "${aws_key_pair.training.id}"
54+
vpc_security_group_ids = ["${aws_security_group.web.id}"]
6255

6356
tags {
6457
"Name" = "${var.identity} web ${count.index+1}/${var.num_webs}"
6558
"Identity" = "${var.identity}"
6659
"Created-by" = "Terraform"
6760
}
68-
69-
connection {
70-
user = "ubuntu"
71-
private_key = "${file("~/.ssh/id_rsa")}"
72-
}
73-
74-
provisioner "file" {
75-
source = "assets"
76-
destination = "/tmp/"
77-
}
78-
79-
provisioner "remote-exec" {
80-
inline = [
81-
"sudo sh /tmp/assets/setup-web.sh",
82-
]
83-
}
8461
}
8562

8663
output "public_ip" {

0 commit comments

Comments
 (0)