Don't put local_file resources in module directories

Put them in their own directories or Terraform will regenerate files
over and over.

Author: bzub

dns.tf

@@ -9,5 +9,5 @@ data "template_file" "kube_dns_cfg" {
 resource "local_file" "kube_dns_cfg" {
   depends_on = ["module.bootkube"]
   content    = "${data.template_file.kube_dns_cfg.rendered}"
-  filename   = "${path.module}/${var.asset_dir}/manifests/kube-dns-cfg.yaml"
+  filename   = "${path.module}/${var.asset_dir}/manifests-custom/kube-dns-cfg.yaml"
 }

kube-router.tf

@@ -15,5 +15,5 @@ resource "local_file" "kube_router" {
   count      = "${var.use_kube_router}"
   depends_on = ["module.bootkube"]
   content    = "${data.template_file.kube_router.rendered}"
-  filename   = "${path.module}/${var.asset_dir}/manifests-networking/kube-router.yaml"
+  filename   = "${path.module}/${var.asset_dir}/manifests-custom/kube-router.yaml"
 }

ssh.tf

@@ -1,10 +1,10 @@
 # Write private SSH key to file for e2e, etc
 resource "local_file" "ssh_key_private" {
   content  = "${tls_private_key.ssh.private_key_pem}"
-  filename = "${path.module}/assets/auth/id_rsa"
+  filename = "${path.module}/assets/auth-custom/id_rsa"
 
   provisioner "local-exec" {
-    command = "chmod 600 ${path.module}/assets/auth/id_rsa"
+    command = "chmod 600 ${path.module}/assets/auth-custom/id_rsa"
   }
 }
 

templates/node.yaml

@@ -486,7 +486,7 @@ storage:
           # Wrapper for bootkube start
           set -e
           # Move experimental manifests
-          [ -d /opt/bootkube/assets/manifests-* ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-*
+          [ -n "$(ls -d /opt/bootkube/assets/manifests-*)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-*
           [ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests
           [ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests
           BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"