Skip to content

Commit 0bec46d

Browse files
committed
pkg/asset/cluster: Only unpack the Terraform we need
Don't unpack modules which are not needed for the target platform. And shuffle our modules around to collect the per-package stuff together. Now that we have a single Terraform step and all the shared asset generation is in Go, we can dispense with the modules/ distinction.
1 parent df14588 commit 0bec46d

36 files changed

+24
-48
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ resource "aws_subnet" "example" {
2727
}
2828
2929
module "bootstrap" {
30-
source = "github.com/openshift/installer//modules/aws/bootstrap"
30+
source = "github.com/openshift/installer//data/data/aws/bootstrap"
3131
3232
ami = "ami-0af8953af3ec06b7c"
3333
bucket = "${aws_s3_bucket.example.id}"
File renamed without changes.

data/data/aws/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ provider "aws" {
1616
}
1717

1818
module "bootstrap" {
19-
source = "../modules/aws/bootstrap"
19+
source = "./bootstrap"
2020

2121
ami = "${var.tectonic_aws_ec2_ami_override}"
2222
associate_public_ip_address = "${var.tectonic_aws_endpoints != "private"}"
@@ -36,7 +36,7 @@ module "bootstrap" {
3636
}
3737

3838
module "masters" {
39-
source = "../modules/aws/master"
39+
source = "./master"
4040

4141
elb_api_internal_id = "${module.vpc.aws_elb_api_internal_id}"
4242
elb_api_external_id = "${module.vpc.aws_elb_api_external_id}"
@@ -60,14 +60,14 @@ module "masters" {
6060
}
6161

6262
module "iam" {
63-
source = "../modules/aws/iam"
63+
source = "./iam"
6464

6565
cluster_name = "${var.tectonic_cluster_name}"
6666
worker_iam_role = "${var.tectonic_aws_worker_iam_role_name}"
6767
}
6868

6969
module "dns" {
70-
source = "../modules/dns/route53"
70+
source = "./route53"
7171

7272
api_external_elb_dns_name = "${module.vpc.aws_elb_api_external_dns_name}"
7373
api_external_elb_zone_id = "${module.vpc.aws_elb_api_external_zone_id}"
@@ -89,7 +89,7 @@ module "dns" {
8989
}
9090

9191
module "vpc" {
92-
source = "../modules/aws/vpc"
92+
source = "./vpc"
9393

9494
base_domain = "${var.tectonic_base_domain}"
9595
cidr_block = "${var.tectonic_aws_vpc_cidr_block}"

0 commit comments

Comments
 (0)