From bfa1a679ebff19a3ad5cf9b0525dac6a2ab31fda Mon Sep 17 00:00:00 2001
From: Tamer Fahmy <tamer.fahmy@gmail.com>
Date: Fri, 19 Oct 2018 19:11:49 +0200
Subject: [PATCH] Name AWS and DigitalOcean Ignition data sources consistently

---
 aws/container-linux/kubernetes/controllers.tf           | 4 ++--
 aws/container-linux/kubernetes/workers/workers.tf       | 4 ++--
 digital-ocean/container-linux/kubernetes/controllers.tf | 4 ++--
 digital-ocean/container-linux/kubernetes/workers.tf     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf
index 443ef949..428cdff9 100644
--- a/aws/container-linux/kubernetes/controllers.tf
+++ b/aws/container-linux/kubernetes/controllers.tf
@@ -24,7 +24,7 @@ resource "aws_instance" "controllers" {
   instance_type = "${var.controller_type}"
 
   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
   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}"
   content      = "${element(data.template_file.controller_config.*.rendered, count.index)}"
   pretty_print = false
diff --git a/aws/container-linux/kubernetes/workers/workers.tf b/aws/container-linux/kubernetes/workers/workers.tf
index ba990508..783b311d 100644
--- a/aws/container-linux/kubernetes/workers/workers.tf
+++ b/aws/container-linux/kubernetes/workers/workers.tf
@@ -46,7 +46,7 @@ resource "aws_launch_configuration" "worker" {
   spot_price        = "${var.spot_price}"
   enable_monitoring = false
 
-  user_data = "${data.ct_config.worker_ign.rendered}"
+  user_data = "${data.ct_config.worker-ignition.rendered}"
 
   # storage
   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}"
   pretty_print = false
   snippets     = ["${var.clc_snippets}"]
diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf
index 5d382f1a..ec24ece5 100644
--- a/digital-ocean/container-linux/kubernetes/controllers.tf
+++ b/digital-ocean/container-linux/kubernetes/controllers.tf
@@ -44,7 +44,7 @@ resource "digitalocean_droplet" "controllers" {
   ipv6               = 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}"]
 
   tags = [
@@ -86,7 +86,7 @@ data "template_file" "etcds" {
   }
 }
 
-data "ct_config" "controller_ign" {
+data "ct_config" "controller-ignitions" {
   count        = "${var.controller_count}"
   content      = "${element(data.template_file.controller_config.*.rendered, count.index)}"
   pretty_print = false
diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf
index c2b5a266..7acff3af 100644
--- a/digital-ocean/container-linux/kubernetes/workers.tf
+++ b/digital-ocean/container-linux/kubernetes/workers.tf
@@ -25,7 +25,7 @@ resource "digitalocean_droplet" "workers" {
   ipv6               = 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}"]
 
   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}"
   pretty_print = false
   snippets     = ["${var.worker_clc_snippets}"]