CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Name AWS and DigitalOcean Ignition data sources consistently

This commit is contained in:
Tamer Fahmy 2018-10-19 19:11:49 +02:00 committed by Dalton Hubble
parent f1da0731d8
commit bfa1a679eb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aws/container-linux/kubernetes/controllers.tf
View File

@ -24,7 +24,7 @@ resource "aws_instance" "controllers" {
instance_type = "${var.controller_type}" instance_type = "${var.controller_type}"
ami = "${local.ami_id}" ami = "${local.ami_id}"
user_data = "${element(data.ct_config.controller_ign.*.rendered, count.index)}" user_data = "${element(data.ct_config.controller-ignitions.*.rendered, count.index)}"
# storage # storage
root_block_device { root_block_device {
@ -75,7 +75,7 @@ data "template_file" "etcds" {
} }
} }
data "ct_config" "controller_ign" { data "ct_config" "controller-ignitions" {
count = "${var.controller_count}" count = "${var.controller_count}"
content = "${element(data.template_file.controller_config.*.rendered, count.index)}" content = "${element(data.template_file.controller_config.*.rendered, count.index)}"
pretty_print = false pretty_print = false

4
aws/container-linux/kubernetes/workers/workers.tf
View File

@ -46,7 +46,7 @@ resource "aws_launch_configuration" "worker" {
spot_price = "${var.spot_price}" spot_price = "${var.spot_price}"
enable_monitoring = false enable_monitoring = false
user_data = "${data.ct_config.worker_ign.rendered}" user_data = "${data.ct_config.worker-ignition.rendered}"
# storage # storage
root_block_device { root_block_device {
@ -77,7 +77,7 @@ data "template_file" "worker_config" {
} }
} }
data "ct_config" "worker_ign" { data "ct_config" "worker-ignition" {
content = "${data.template_file.worker_config.rendered}" content = "${data.template_file.worker_config.rendered}"
pretty_print = false pretty_print = false
snippets = ["${var.clc_snippets}"] snippets = ["${var.clc_snippets}"]

4
digital-ocean/container-linux/kubernetes/controllers.tf
View File

@ -44,7 +44,7 @@ resource "digitalocean_droplet" "controllers" {
ipv6 = true ipv6 = true
private_networking = true private_networking = true
user_data = "${element(data.ct_config.controller_ign.*.rendered, count.index)}" user_data = "${element(data.ct_config.controller-ignitions.*.rendered, count.index)}"
ssh_keys = ["${var.ssh_fingerprints}"] ssh_keys = ["${var.ssh_fingerprints}"]
tags = [ tags = [
@ -86,7 +86,7 @@ data "template_file" "etcds" {
} }
} }
data "ct_config" "controller_ign" { data "ct_config" "controller-ignitions" {
count = "${var.controller_count}" count = "${var.controller_count}"
content = "${element(data.template_file.controller_config.*.rendered, count.index)}" content = "${element(data.template_file.controller_config.*.rendered, count.index)}"
pretty_print = false pretty_print = false

4
digital-ocean/container-linux/kubernetes/workers.tf
View File

@ -25,7 +25,7 @@ resource "digitalocean_droplet" "workers" {
ipv6 = true ipv6 = true
private_networking = true private_networking = true
user_data = "${data.ct_config.worker_ign.rendered}" user_data = "${data.ct_config.worker-ignition.rendered}"
ssh_keys = ["${var.ssh_fingerprints}"] ssh_keys = ["${var.ssh_fingerprints}"]
tags = [ tags = [
@ -48,7 +48,7 @@ data "template_file" "worker_config" {
} }
} }
data "ct_config" "worker_ign" { data "ct_config" "worker-ignition" {
content = "${data.template_file.worker_config.rendered}" content = "${data.template_file.worker_config.rendered}"
pretty_print = false pretty_print = false
snippets = ["${var.worker_clc_snippets}"] snippets = ["${var.worker_clc_snippets}"]