Rerun terraform fmt

This commit is contained in:
Dalton Hubble 2018-05-01 21:41:22 -07:00
parent cc29530ba0
commit 9d4cbb38f6
8 changed files with 50 additions and 41 deletions

View File

@ -44,6 +44,7 @@ data "template_file" "install-kickstarts" {
resource "matchbox_profile" "controllers" { resource "matchbox_profile" "controllers" {
count = "${length(var.controller_names)}" count = "${length(var.controller_names)}"
name = "${format("%s-controller-%s", var.cluster_name, element(var.controller_names, count.index))}" name = "${format("%s-controller-%s", var.cluster_name, element(var.controller_names, count.index))}"
# cloud-init # cloud-init
generic_config = "${element(data.template_file.controller-configs.*.rendered, count.index)}" generic_config = "${element(data.template_file.controller-configs.*.rendered, count.index)}"
} }
@ -67,6 +68,7 @@ data "template_file" "controller-configs" {
resource "matchbox_profile" "workers" { resource "matchbox_profile" "workers" {
count = "${length(var.worker_names)}" count = "${length(var.worker_names)}"
name = "${format("%s-worker-%s", var.cluster_name, element(var.worker_names, count.index))}" name = "${format("%s-worker-%s", var.cluster_name, element(var.worker_names, count.index))}"
# cloud-init # cloud-init
generic_config = "${element(data.template_file.worker-configs.*.rendered, count.index)}" generic_config = "${element(data.template_file.worker-configs.*.rendered, count.index)}"
} }

View File

@ -13,6 +13,7 @@ variable "matchbox_http_endpoint" {
variable "atomic_assets_endpoint" { variable "atomic_assets_endpoint" {
type = "string" type = "string"
default = "" default = ""
description = <<EOD description = <<EOD
HTTP endpoint serving the Fedora Atomic Host vmlinuz, initrd, os repo, and ostree repo (.e.g `http://example.com/some/path`). HTTP endpoint serving the Fedora Atomic Host vmlinuz, initrd, os repo, and ostree repo (.e.g `http://example.com/some/path`).

View File

@ -48,9 +48,11 @@ resource "google_compute_backend_service" "apiserver" {
backend { backend {
group = "${google_compute_instance_group.controllers.0.self_link}" group = "${google_compute_instance_group.controllers.0.self_link}"
} }
backend { backend {
group = "${google_compute_instance_group.controllers.1.self_link}" group = "${google_compute_instance_group.controllers.1.self_link}"
} }
backend { backend {
group = "${google_compute_instance_group.controllers.2.self_link}" group = "${google_compute_instance_group.controllers.2.self_link}"
} }
@ -74,7 +76,7 @@ resource "google_compute_instance_group" "controllers" {
instances = [ instances = [
"${matchkeys(google_compute_instance.controllers.*.self_link, "${matchkeys(google_compute_instance.controllers.*.self_link,
google_compute_instance.controllers.*.zone, google_compute_instance.controllers.*.zone,
list(element(local.zones, count.index)))}" list(element(local.zones, count.index)))}",
] ]
} }

View File

@ -23,6 +23,7 @@ locals {
# TCP proxy load balancers require a fixed number of zonal backends. Spread # TCP proxy load balancers require a fixed number of zonal backends. Spread
# controllers over up to 3 zones, since all GCP regions have at least 3. # controllers over up to 3 zones, since all GCP regions have at least 3.
zones = "${slice(data.google_compute_zones.all.names, 0, 3)}" zones = "${slice(data.google_compute_zones.all.names, 0, 3)}"
controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.assigned_nat_ip}"] controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.assigned_nat_ip}"]
} }

View File

@ -48,9 +48,11 @@ resource "google_compute_backend_service" "apiserver" {
backend { backend {
group = "${google_compute_instance_group.controllers.0.self_link}" group = "${google_compute_instance_group.controllers.0.self_link}"
} }
backend { backend {
group = "${google_compute_instance_group.controllers.1.self_link}" group = "${google_compute_instance_group.controllers.1.self_link}"
} }
backend { backend {
group = "${google_compute_instance_group.controllers.2.self_link}" group = "${google_compute_instance_group.controllers.2.self_link}"
} }
@ -74,7 +76,7 @@ resource "google_compute_instance_group" "controllers" {
instances = [ instances = [
"${matchkeys(google_compute_instance.controllers.*.self_link, "${matchkeys(google_compute_instance.controllers.*.self_link,
google_compute_instance.controllers.*.zone, google_compute_instance.controllers.*.zone,
list(element(local.zones, count.index)))}" list(element(local.zones, count.index)))}",
] ]
} }

View File

@ -23,6 +23,7 @@ locals {
# TCP proxy load balancers require a fixed number of zonal backends. Spread # TCP proxy load balancers require a fixed number of zonal backends. Spread
# controllers over up to 3 zones, since all GCP regions have at least 3. # controllers over up to 3 zones, since all GCP regions have at least 3.
zones = "${slice(data.google_compute_zones.all.names, 0, 3)}" zones = "${slice(data.google_compute_zones.all.names, 0, 3)}"
controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.assigned_nat_ip}"] controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.assigned_nat_ip}"]
} }