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.

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

wip: steps: Ignore AMI overrides #157

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 4 additions & 15 deletions modules/aws/vpc/sg-etcd.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,15 @@ resource "aws_security_group" "etcd" {

ingress {
protocol = "tcp"
from_port = 22
to_port = 22
from_port = 0
to_port = 65535
self = true

security_groups = ["${aws_security_group.master.id}"]
}

ingress {
protocol = "tcp"
from_port = 2379
to_port = 2379
self = true

from_port = 0
to_port = 65535
security_groups = ["${aws_security_group.master.id}"]
}

ingress {
protocol = "tcp"
from_port = 2380
to_port = 2380
self = true
}
}
1 change: 0 additions & 1 deletion steps/etcd/aws/etcd.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ module "etcd" {
sg_ids = "${concat(var.tectonic_aws_etcd_extra_sg_ids, list(local.sg_id))}"
subnets = ["${local.subnet_ids_workers}"]
etcd_iam_role = "${var.tectonic_aws_etcd_iam_role_name}"
ec2_ami = "${var.tectonic_aws_ec2_ami_override}"
}

resource "aws_route53_record" "etcd_a_nodes" {
Expand Down
1 change: 0 additions & 1 deletion steps/joining_workers/aws/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ module "workers" {
sg_ids = "${concat(var.tectonic_aws_worker_extra_sg_ids, list(local.sg_id))}"
subnet_ids = "${local.subnet_ids}"
worker_iam_role = "${var.tectonic_aws_worker_iam_role_name}"
ec2_ami = "${var.tectonic_aws_ec2_ami_override}"
base_domain = "${var.tectonic_base_domain}"
user_data_ign = "${file("${path.cwd}/${var.tectonic_ignition_worker}")}"
}
1 change: 0 additions & 1 deletion steps/masters/aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@ module "masters" {
root_volume_size = "${var.tectonic_aws_master_root_volume_size}"
root_volume_type = "${var.tectonic_aws_master_root_volume_type}"
subnet_ids = "${local.subnet_ids}"
ec2_ami = "${var.tectonic_aws_ec2_ami_override}"
user_data_ign = "${file("${path.cwd}/${var.tectonic_ignition_master}")}"
}