CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-23 08:21:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor naming inconsistencies in Ignition and CLC data

Browse Source
This commit is contained in:
Dalton Hubble
2018-10-27 16:24:59 -07:00
parent bfa1a679eb
commit 9b405a19b2
6 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
azure/container-linux/kubernetes/require.tf
View File

@ -23,4 +23,3 @@ provider "template" {
provider "tls" {
version = "~> 1.0"
}

8
azure/container-linux/kubernetes/workers/workers.tf
View File

@ -37,7 +37,7 @@ resource "azurerm_virtual_machine_scale_set" "workers" {
os_profile {
computer_name_prefix = "${var.name}-worker-"
admin_username = "core"
custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}"
custom_data = "${data.ct_config.worker-ignition.rendered}"
}
# Azure mandates setting an ssh_key, even though Ignition custom_data handles it too
@ -93,14 +93,14 @@ resource "azurerm_autoscale_setting" "workers" {
}
# Worker Ignition configs
data "ct_config" "worker-ignitions" {
content = "${data.template_file.worker-configs.rendered}"
data "ct_config" "worker-ignition" {
content = "${data.template_file.worker-config.rendered}"
pretty_print = false
snippets = ["${var.clc_snippets}"]
}
# Worker Container Linux configs
data "template_file" "worker-configs" {
data "template_file" "worker-config" {
template = "${file("${path.module}/cl/worker.yaml.tmpl")}"
vars = {