decouple assets and ignition from main bootstrap

modules/aws/etcd/nodes.tf

@@ -1,6 +1,7 @@
 locals {
-  ami_owner = "595879546273"
-  arn       = "aws"
+  ami_owner          = "595879546273"
+  arn                = "aws"
+  ignition_etcd_keys = ["ignition_etcd_0.json", "ignition_etcd_1.json", "ignition_etcd_2.json"]
 }
 
 data "aws_ami" "coreos_ami" {
@@ -98,6 +99,14 @@ resource "aws_iam_role_policy" "etcd" {
 EOF
 }
 
+data "ignition_config" "s3" {
+  count = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
+
+  replace {
+    source = "${format("s3://%s/%s", var.s3_bucket, local.ignition_etcd_keys[count.index])}"
+  }
+}
+
 resource "aws_instance" "etcd_node" {
   count = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
   ami   = "${coalesce(var.ec2_ami, data.aws_ami.coreos_ami.image_id)}"

modules/aws/etcd/variables.tf

@@ -42,11 +42,6 @@ variable "ec2_type" {
   type = "string"
 }
 
-variable "ec2_ami" {
-  type    = "string"
-  default = ""
-}
-
 variable "extra_tags" {
   description = "Extra AWS tags to be applied to created resources."
   type        = "map"
@@ -74,18 +69,10 @@ variable "sg_ids" {
   description = "The security group IDs to be applied."
 }
 
-variable "ign_etcd_dropin_id_list" {
-  type = "list"
-}
-
 variable "s3_bucket" {
   type = "string"
 }
 
-variable "ign_etcd_crt_id_list" {
-  type = "list"
-}
-
 variable "etcd_iam_role" {
   type        = "string"
   default     = ""
@@ -97,12 +84,7 @@ variable "dns_server_ip" {
   default = ""
 }
 
-variable "ign_profile_env_id" {
-  type    = "string"
-  default = ""
-}
-
-variable "ign_systemd_default_env_id" {
+variable "ec2_ami" {
   type    = "string"
   default = ""
 }

modules/aws/master-asg/master.tf

@@ -59,6 +59,24 @@ resource "aws_autoscaling_group" "masters" {
   }
 }
 
+data "ignition_config" "s3" {
+  append {
+    source = "http://${var.cluster_name}-ncg.${var.base_domain}/ignition?profile=controller"
+  }
+
+  files = ["${data.ignition_file.kubeconfig.id}"]
+}
+
+data "ignition_file" "kubeconfig" {
+  filesystem = "root"
+  path       = "/etc/kubernetes/kubeconfig"
+  mode       = 0644
+
+  content {
+    content = "${var.kubeconfig_content}"
+  }
+}
+
 resource "aws_launch_configuration" "master_conf" {
   instance_type               = "${var.ec2_type}"
   image_id                    = "${coalesce(var.ec2_ami, data.aws_ami.coreos_ami.image_id)}"